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 edc1545cc782d0bbf90076bb54809f9757a6a4b8..077fa053a94f72bf75ac20a0980cd94ec6e3380b 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -1,6 +1,4 @@
-
-/*
- * folder(s).c -- set/list the current message and/or folder
+/* folder.c -- set/list the current message and/or folder

  *             -- push/pop a folder onto/from the folder stack
  *             -- list the folder stack
  *
  *             -- push/pop a folder onto/from the folder stack
  *             -- list the folder stack
  *


@@ -337,7 +335,8 @@ main (int argc, char **argv)
            if (msg)
                inform("no folder given for message %s, continuing...", msg);
            readonly_folders (); /* do any readonly folders */
            if (msg)
                inform("no folder given for message %s, continuing...", msg);
            readonly_folders (); /* do any readonly folders */

-           strncpy (folder, (cp = context_find (pfolder)) ? cp : "", sizeof(folder));
+           cp = context_find(pfolder);
+           strncpy (folder, FENDNULL(cp), sizeof(folder));

            crawl_folders (".", get_folder_info_callback, NULL);
        } else {
            strncpy (folder, argfolder, sizeof(folder));
            crawl_folders (".", get_folder_info_callback, NULL);
        } else {
            strncpy (folder, argfolder, sizeof(folder));


@@ -569,9 +568,9 @@ print_folders (void)
                        nummsgdigits, "no",
                        fi[i].others ? lowmsgdigits + hghmsgdigits + 5 : 0, "");
            } else {
                        nummsgdigits, "no",
                        fi[i].others ? lowmsgdigits + hghmsgdigits + 5 : 0, "");
            } else {

-               printf ("has %*d message%s  (%*d-%*d)",
+               printf ("has %*d message%1s  (%*d-%*d)",

                        nummsgdigits, fi[i].nummsg,
                        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) {


@@ -592,16 +591,16 @@ 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);
 }
 
 /*

- * Set the current message and sychronize sequences
+ * Set the current message and synchronize sequences

  */
 
 static int
  */
 
 static int