X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6bc64765f773ce75454ec1592a86779e3547fe46..dffeac1b8759bbedb385d0d2003a6d4c6c008cd5:/uip/folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 98ecde68..4f36ed0e 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,16 @@ 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.
+ */
+void
+nonexistant_folder (int status) {
+    NMH_UNUSED (status);
+    adios (NULL, "folder %s does not exist", folder);
+}
+
 
 int
 main (int argc, char **argv)
@@ -349,7 +359,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, nonexistant_folder);
 
 	if (get_folder_info (folder, msg) && argfolder) {
 	    /* update current folder */
@@ -396,8 +406,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;
 	}
 
@@ -406,8 +417,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     */
 	}