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 3f032904ea30d5952a9d98296b05569a234e2706..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
  *
@@ -118,8 +116,7 @@ main (int argc, char **argv)
      * If program was invoked with name ending
      * in `s', then add switch `-all'.
      */
-    if (argv[0][strlen (argv[0]) - 1] == 's')
-       all = 1;
+    all = has_suffix_c(argv[0], 's');
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -255,7 +252,7 @@ main (int argc, char **argv)
            /* If no folder is given, the current folder and */
            /* the top of the folder stack are swapped.      */
            if ((cp = context_find (stack))) {
-               dp = getcpy (cp);
+               dp = mh_xstrdup(cp);
                ap = brkstring (dp, " ", "\n");
                argfolder = getcpy(*ap++);
            } else {
@@ -279,7 +276,7 @@ main (int argc, char **argv)
        if (argfolder)
            adios (NULL, "sorry, no folders allowed with -pop");
        if ((cp = context_find (stack))) {
-           dp = getcpy (cp);
+           dp = mh_xstrdup(cp);
            ap = brkstring (dp, " ", "\n");
            argfolder = getcpy(*ap++);
        } else {
@@ -307,14 +304,14 @@ main (int argc, char **argv)
 
     /* Listing the folder stack */
     if (listsw) {
-       printf ("%s", argfolder ? argfolder : getfolder (1));
+       fputs(argfolder ? argfolder : getfolder (1), stdout);
        if ((cp = context_find (stack))) {
-           dp = getcpy (cp);
+           dp = mh_xstrdup(cp);
            for (ap = brkstring (dp, " ", "\n"); *ap; ap++)
                printf (" %s", *ap);
            free (dp);
        }
-       printf ("\n");
+       putchar('\n');
 
        if (!printsw)
            done (0);
@@ -336,9 +333,10 @@ main (int argc, char **argv)
         */
        if (!argfolder) {
            if (msg)
-               admonish (NULL, "no folder given for message %s", 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));
@@ -408,7 +406,7 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
         * create message structure and get folder info
         */
        if (!(mp = folder_read (fold, fpack))) {
-           admonish (NULL, "unable to read folder %s", fold);
+           inform("unable to read folder %s, continuing...", fold);
            *crawl_children = FALSE;
            return 0;
        }
@@ -547,7 +545,7 @@ print_folders (void)
     if (all || fshort || ftotal < 1) {
        for (i = 0; i < total_folders; i++) {
            if (fshort) {
-               printf ("%s\n", fi[i].name);
+               puts(fi[i].name);
                continue;
            }
 
@@ -570,9 +568,9 @@ print_folders (void)
                        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,
-                       (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) {
@@ -583,7 +581,7 @@ print_folders (void)
 
            if (fi[i].others)
                printf (";%*s (others)", curprinted ? 0 : curmsgdigits + 6, "");
-           printf (".\n");
+           puts(".");
        }
     }
 
@@ -592,17 +590,17 @@ print_folders (void)
      */
     if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
        if (all)
-           printf ("\n");
-       printf ("TOTAL = %d message%c in %d folder%s.\n",
-               total_msgs, total_msgs != 1 ? 's' : ' ',
-               total_folders, total_folders != 1 ? "s" : "");
+           putchar('\n');
+       printf ("TOTAL = %d message%s in %d folder%s.\n",
+               total_msgs, PLURALS(total_msgs),
+               total_folders, PLURALS(total_folders));
     }
 
     fflush (stdout);
 }
 
 /*
- * Set the current message and sychronize sequences
+ * Set the current message and synchronize sequences
  */
 
 static int
@@ -613,7 +611,7 @@ sfold (struct msgs *mp, char *msg)
        return 0;
 
     if (mp->numsel > 1) {
-       admonish (NULL, "only one message at a time!");
+       inform("only one message at a time!, continuing...");
        return 0;
     }
     seq_setprev (mp);          /* set the previous-sequence     */