mhlsbr.c: Flip parse()'s logic. Remove oneline()'s else after break.

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 87e18a1642675f112dd6699b0d86f3b90858779a..bfeee8fabfcf4fecbc8b9d59525b4e92446a275f 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;


@@ -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;
        }


@@ -601,7 +599,7 @@ print_folders (void)
 }
 
 /*
 }
 
 /*

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

  */
 
 static int
  */
 
 static int


@@ -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     */