sbr/vector.c: Zero the growth with memset(3), not loop.

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 7e00a8124104a6b34d15acab32ea20cc8aaaf1a5..a3cc4ec65de284c790f185e919b9d9be5bedb763 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
  *


@@ -118,7 +116,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 = HasSuffixC(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,7 +304,7 @@ 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++)
        if ((cp = context_find (stack))) {
            dp = mh_xstrdup(cp);
            for (ap = brkstring (dp, " ", "\n"); *ap; ap++)


@@ -335,7 +333,7 @@ main (int argc, char **argv)
         */
        if (!argfolder) {
            if (msg)
         */
        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));
            crawl_folders (".", get_folder_info_callback, NULL);
            readonly_folders (); /* do any readonly folders */
            strncpy (folder, (cp = context_find (pfolder)) ? cp : "", sizeof(folder));
            crawl_folders (".", get_folder_info_callback, NULL);


@@ -407,7 +405,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))) {
         * 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;
        }
            *crawl_children = FALSE;
            return 0;
        }


@@ -546,7 +544,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 +580,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(".");

        }
     }
 
        }
     }
 


@@ -612,7 +610,7 @@ sfold (struct msgs *mp, char *msg)
        return 0;
 
     if (mp->numsel > 1) {
        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     */
        return 0;
     }
     seq_setprev (mp);          /* set the previous-sequence     */