sbr/utils.c: Use h/signals.h for setup_signal_handlers prototype.

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 68e9182dddf95f154d3420dd3f028a823f4cace9..077fa053a94f72bf75ac20a0980cd94ec6e3380b 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -570,7 +570,7 @@ print_folders (void)
            } else {
                printf ("has %*d message%1s  (%*d-%*d)",
                        nummsgdigits, fi[i].nummsg,
            } else {
                printf ("has %*d message%1s  (%*d-%*d)",
                        nummsgdigits, fi[i].nummsg,

-                       (fi[i].nummsg == 1) ? "" : "s",
+                       PLURALS(fi[i].nummsg),

                        lowmsgdigits, fi[i].lowmsg,
                        hghmsgdigits, fi[i].hghmsg);
                if (fi[i].curmsg >= fi[i].lowmsg && fi[i].curmsg <= fi[i].hghmsg) {
                        lowmsgdigits, fi[i].lowmsg,
                        hghmsgdigits, fi[i].hghmsg);
                if (fi[i].curmsg >= fi[i].lowmsg && fi[i].curmsg <= fi[i].hghmsg) {


@@ -591,9 +591,9 @@ print_folders (void)
     if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
        if (all)
            putchar('\n');
     if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
        if (all)
            putchar('\n');

-       printf ("TOTAL = %d message%c in %d folder%s.\n",
-               total_msgs, total_msgs != 1 ? 's' : ' ',
-               total_folders, total_folders != 1 ? "s" : "");
+       printf ("TOTAL = %d message%s in %d folder%s.\n",
+               total_msgs, PLURALS(total_msgs),
+               total_folders, PLURALS(total_folders));

     }
 
     fflush (stdout);
     }
 
     fflush (stdout);