X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/337b4e616e8f53ba06285b1645e1df9918ed5c16..b0aa8cdb1c264e42d4931ca24968689c73381278:/uip/folder.c

diff --git a/uip/folder.c b/uip/folder.c
index fc183774..7e00a812 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)
@@ -107,8 +118,7 @@ main (int argc, char **argv)
      * If program was invoked with name ending
      * in `s', then add switch `-all'.
      */
-    if (argv[0][strlen (argv[0]) - 1] == 's')
-	all = 1;
+    all = HasSuffixC(argv[0], 's');
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -244,7 +254,7 @@ main (int argc, char **argv)
 	    /* If no folder is given, the current folder and */
 	    /* the top of the folder stack are swapped.      */
 	    if ((cp = context_find (stack))) {
-		dp = getcpy (cp);
+		dp = mh_xstrdup(cp);
 		ap = brkstring (dp, " ", "\n");
 		argfolder = getcpy(*ap++);
 	    } else {
@@ -268,7 +278,7 @@ main (int argc, char **argv)
 	if (argfolder)
 	    adios (NULL, "sorry, no folders allowed with -pop");
 	if ((cp = context_find (stack))) {
-	    dp = getcpy (cp);
+	    dp = mh_xstrdup(cp);
 	    ap = brkstring (dp, " ", "\n");
 	    argfolder = getcpy(*ap++);
 	} else {
@@ -298,12 +308,12 @@ main (int argc, char **argv)
     if (listsw) {
 	printf ("%s", argfolder ? argfolder : getfolder (1));
 	if ((cp = context_find (stack))) {
-	    dp = getcpy (cp);
+	    dp = mh_xstrdup(cp);
 	    for (ap = brkstring (dp, " ", "\n"); *ap; ap++)
 		printf (" %s", *ap);
 	    free (dp);
 	}
-	printf ("\n");
+	putchar('\n');
 
 	if (!printsw)
 	    done (0);
@@ -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, nonexistent_folder);
 
 	if (get_folder_info (folder, msg) && argfolder) {
 	    /* update current folder */
@@ -396,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, 1))) {
+	if (!(mp = folder_read (fold, fpack))) {
 	    admonish (NULL, "unable to read folder %s", fold);
 	    *crawl_children = FALSE;
 	    return 0;
@@ -581,7 +591,7 @@ print_folders (void)
      */
     if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
 	if (all)
-	    printf ("\n");
+	    putchar('\n');
 	printf ("TOTAL = %d message%c in %d folder%s.\n",
 		total_msgs, total_msgs != 1 ? 's' : ' ',
 		total_folders, total_folders != 1 ? "s" : "");
@@ -623,7 +633,7 @@ readonly_folders (void)
 {
     int	atrlen;
     char atrcur[BUFSIZ];
-    register struct node *np;
+    struct node *np;
 
     snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
     atrlen = strlen (atrcur);