X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/64e8827c5d5def0325ab7181fe939623c77e807c..bd057d60eba167871169c243a64dbf9d7d9f4cde:/uip/folder.c

diff --git a/uip/folder.c b/uip/folder.c
index a2e6a4a8..d71b43f0 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -33,7 +33,7 @@
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \
     X("print", 0, PRNTSW) \
-    X("noprint", -4, NPRNTSW) \
+    X("noprint", 0, NPRNTSW) \
     X("push", 0, PUSHSW) \
     X("pop", 0, POPSW) \
     X("version", 0, VERSIONSW) \
@@ -92,6 +92,17 @@ static void print_folders (void);
 static int sfold (struct msgs *, char *);
 static void readonly_folders (void);
 
+/*
+ * Function for printing error message if folder does not exist with
+ * -nocreate.
+ */
+static
+void
+nonexistent_folder (int status) {
+    NMH_UNUSED (status);
+    adios (NULL, "folder %s does not exist", folder);
+}
+
 
 int
 main (int argc, char **argv)
@@ -101,11 +112,7 @@ main (int argc, char **argv)
     char *cp, *dp, *msg = NULL, *argfolder = NULL;
     char **ap, **argp, buf[BUFSIZ], **arguments;
 
-    setlocale(LC_ALL, "");
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     /*
      * If program was invoked with name ending
@@ -353,7 +360,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, done);
+        create_folder (m_maildir (folder), fcreat, nonexistent_folder);
 
 	if (get_folder_info (folder, msg) && argfolder) {
 	    /* update current folder */
@@ -400,8 +407,9 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
 	/*
 	 * create message structure and get folder info
 	 */
-	if (!(mp = folder_read (fold, 1))) {
+	if (!(mp = folder_read (fold, fpack))) {
 	    admonish (NULL, "unable to read folder %s", fold);
+	    *crawl_children = FALSE;
 	    return 0;
 	}
 
@@ -410,8 +418,10 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
 	    retval = 0;
 
 	if (fpack) {
-	    if (folder_pack (&mp, fverb) == -1)
+	    if (folder_pack (&mp, fverb) == -1) {
+		*crawl_children = FALSE; /* to please clang static analyzer */
 		done (1);
+	    }
 	    seq_save (mp);		/* synchronize the sequences */
 	    context_save ();	/* save the context file     */
 	}