Reverted commit 9a4b4a3d3b27fe4a7ff6d0b8724ce1c06b5917eb.

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 4f36ed0e3aba3e913d8b5365722482f45552a650..87e18a1642675f112dd6699b0d86f3b90858779a 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -96,8 +96,9 @@ static void readonly_folders (void);
  * Function for printing error message if folder does not exist with
  * -nocreate.
  */
+static
 void
-nonexistant_folder (int status) {
+nonexistent_folder (int status) {
     NMH_UNUSED (status);
     adios (NULL, "folder %s does not exist", folder);
 }
@@ -117,8 +118,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 = HasSuffixC(argv[0], 's');
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -254,7 +254,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 {
@@ -278,7 +278,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 {
@@ -306,14 +306,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);
@@ -359,7 +359,7 @@ main (int argc, char **argv)
         * Check if folder exists.  If not, then see if
         * we should create it, or just exit.
         */
-        create_folder (m_maildir (folder), fcreat, nonexistant_folder);
+        create_folder (m_maildir (folder), fcreat, nonexistent_folder);
 
        if (get_folder_info (folder, msg) && argfolder) {
            /* update current folder */
@@ -546,7 +546,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;
            }
 
@@ -582,7 +582,7 @@ print_folders (void)
 
            if (fi[i].others)
                printf (";%*s (others)", curprinted ? 0 : curmsgdigits + 6, "");
-           printf (".\n");
+           puts(".");
        }
     }
 
@@ -591,7 +591,7 @@ print_folders (void)
      */
     if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
        if (all)
-           printf ("\n");
+           putchar('\n');
        printf ("TOTAL = %d message%c in %d folder%s.\n",
                total_msgs, total_msgs != 1 ? 's' : ' ',
                total_folders, total_folders != 1 ? "s" : "");
@@ -633,7 +633,7 @@ readonly_folders (void)
 {
     int        atrlen;
     char atrcur[BUFSIZ];
-    register struct node *np;
+    struct node *np;
 
     snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
     atrlen = strlen (atrcur);