X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d51964a51fdc08d92dab9825a8357c9adba34aa7..57c33630533f1f4c057a44bfaa9e48e306dcd1f4:/uip/folder.c?ds=sidebyside

diff --git a/uip/folder.c b/uip/folder.c
index f1af6f25..87e18a16 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) \
@@ -96,8 +96,9 @@ static void readonly_folders (void);
  * Function for printing error message if folder does not exist with
  * -nocreate.
  */
+static
 void
-nonexistant_folder (int status) {
+nonexistent_folder (int status) {
     NMH_UNUSED (status);
     adios (NULL, "folder %s does not exist", folder);
 }
@@ -117,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;
@@ -254,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 {
@@ -278,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 {
@@ -306,14 +306,14 @@ main (int argc, char **argv)
 
     /* Listing the folder stack */
     if (listsw) {
-	printf ("%s", argfolder ? argfolder : getfolder (1));
+	fputs(argfolder ? argfolder : getfolder (1), stdout);
 	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);
@@ -359,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, nonexistant_folder);
+        create_folder (m_maildir (folder), fcreat, nonexistent_folder);
 
 	if (get_folder_info (folder, msg) && argfolder) {
 	    /* update current folder */
@@ -406,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;
@@ -546,7 +546,7 @@ print_folders (void)
     if (all || fshort || ftotal < 1) {
 	for (i = 0; i < total_folders; i++) {
 	    if (fshort) {
-		printf ("%s\n", fi[i].name);
+		puts(fi[i].name);
 		continue;
 	    }
 
@@ -582,7 +582,7 @@ print_folders (void)
 
 	    if (fi[i].others)
 		printf (";%*s (others)", curprinted ? 0 : curmsgdigits + 6, "");
-	    printf (".\n");
+	    puts(".");
 	}
     }
 
@@ -591,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" : "");
@@ -633,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);