X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ec68c7d9fca00e976df02842dc2c9d5a523567af..a5c6f670c3636f018a65738645bf712e99d27698:/uip/folder.c

diff --git a/uip/folder.c b/uip/folder.c
index a3cc4ec6..625d68ad 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -10,6 +10,7 @@
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
+#include "sbr/m_maildir.h"
 
 #define FOLDER_SWITCHES \
     X("all", 0, ALLSW) \
@@ -225,13 +226,11 @@ main (int argc, char **argv)
 	if (*cp == '+' || *cp == '@') {
 	    if (argfolder)
 		adios (NULL, "only one folder at a time!");
-	    else
-		argfolder = pluspath (cp);
+            argfolder = pluspath (cp);
 	} else {
 	    if (msg)
 		adios (NULL, "only one (current) message at a time!");
-	    else
-		msg = cp;
+            msg = cp;
 	}
     }
 
@@ -335,7 +334,8 @@ main (int argc, char **argv)
 	    if (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));
@@ -376,7 +376,7 @@ main (int argc, char **argv)
 }
 
 static int
-get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
+get_folder_info_body (char *fold, char *msg, bool *crawl_children)
 {
     int	i, retval = 1;
     struct msgs *mp = NULL;
@@ -406,7 +406,7 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
 	 */
 	if (!(mp = folder_read (fold, fpack))) {
 	    inform("unable to read folder %s, continuing...", fold);
-	    *crawl_children = FALSE;
+	    *crawl_children = false;
 	    return 0;
 	}
 
@@ -416,7 +416,7 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
 
 	if (fpack) {
 	    if (folder_pack (&mp, fverb) == -1) {
-		*crawl_children = FALSE; /* to please clang static analyzer */
+		*crawl_children = false; /* to please clang static analyzer */
 		done (1);
 	    }
 	    seq_save (mp);		/* synchronize the sequences */
@@ -440,10 +440,10 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
     return retval;
 }
 
-static boolean
+static bool
 get_folder_info_callback (char *fold, void *baton)
 {
-    boolean crawl_children;
+    bool crawl_children;
     NMH_UNUSED (baton);
 
     get_folder_info_body (fold, NULL, &crawl_children);
@@ -454,7 +454,7 @@ get_folder_info_callback (char *fold, void *baton)
 static int
 get_folder_info (char *fold, char *msg)
 {
-    boolean crawl_children;
+    bool crawl_children;
     int retval;
 
     retval = get_folder_info_body (fold, msg, &crawl_children);
@@ -567,9 +567,9 @@ print_folders (void)
 			nummsgdigits, "no",
 			fi[i].others ? lowmsgdigits + hghmsgdigits + 5 : 0, "");
 	    } else {
-		printf ("has %*d message%s  (%*d-%*d)",
+		printf ("has %*d message%1s  (%*d-%*d)",
 			nummsgdigits, fi[i].nummsg,
-			(fi[i].nummsg == 1) ? " " : "s",
+			PLURALS(fi[i].nummsg),
 			lowmsgdigits, fi[i].lowmsg,
 			hghmsgdigits, fi[i].hghmsg);
 		if (fi[i].curmsg >= fi[i].lowmsg && fi[i].curmsg <= fi[i].hghmsg) {
@@ -590,16 +590,16 @@ print_folders (void)
     if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
 	if (all)
 	    putchar('\n');
-	printf ("TOTAL = %d message%c in %d folder%s.\n",
-		total_msgs, total_msgs != 1 ? 's' : ' ',
-		total_folders, total_folders != 1 ? "s" : "");
+	printf ("TOTAL = %d message%s in %d folder%s.\n",
+		total_msgs, PLURALS(total_msgs),
+		total_folders, PLURALS(total_folders));
     }
 
     fflush (stdout);
 }
 
 /*
- * Set the current message and sychronize sequences
+ * Set the current message and synchronize sequences
  */
 
 static int