Use FENDNULL() instead of duplicate, locally defined, empty().

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 10c9290a243f719a81c7c5a564e2d561d7721248..23aea0b740adde862fe64c9f4beb6474d53c573f 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
  *
@@ -335,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));
@@ -407,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;
        }
@@ -601,7 +600,7 @@ print_folders (void)
 }
 
 /*
- * Set the current message and sychronize sequences
+ * Set the current message and synchronize sequences
  */
 
 static int
@@ -612,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     */