Editing of man/mhmail.man.

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 85e0c53b3d3123c6ca9aa90ea8ba8c41ab25d274..10c9290a243f719a81c7c5a564e2d561d7721248 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -118,7 +118,7 @@ main (int argc, char **argv)
      * If program was invoked with name ending
      * in `s', then add switch `-all'.
      */
      * If program was invoked with name ending
      * in `s', then add switch `-all'.
      */

-    all = EndsWithC(argv[0], 's');
+    all = has_suffix_c(argv[0], 's');

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -306,14 +306,14 @@ main (int argc, char **argv)
 
     /* Listing the folder stack */
     if (listsw) {
 
     /* Listing the folder stack */
     if (listsw) {

-       printf ("%s", argfolder ? argfolder : getfolder (1));
+       fputs(argfolder ? argfolder : getfolder (1), stdout);

        if ((cp = context_find (stack))) {
            dp = mh_xstrdup(cp);
            for (ap = brkstring (dp, " ", "\n"); *ap; ap++)
                printf (" %s", *ap);
            free (dp);
        }
        if ((cp = context_find (stack))) {
            dp = mh_xstrdup(cp);
            for (ap = brkstring (dp, " ", "\n"); *ap; ap++)
                printf (" %s", *ap);
            free (dp);
        }

-       printf ("\n");
+       putchar('\n');

 
        if (!printsw)
            done (0);
 
        if (!printsw)
            done (0);


@@ -546,7 +546,7 @@ print_folders (void)
     if (all || fshort || ftotal < 1) {
        for (i = 0; i < total_folders; i++) {
            if (fshort) {
     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;
            }
 
                continue;
            }
 


@@ -582,7 +582,7 @@ print_folders (void)
 
            if (fi[i].others)
                printf (";%*s (others)", curprinted ? 0 : curmsgdigits + 6, "");
 
            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)
      */
     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" : "");
        printf ("TOTAL = %d message%c in %d folder%s.\n",
                total_msgs, total_msgs != 1 ? 's' : ' ',
                total_folders, total_folders != 1 ? "s" : "");