X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5dd6771b28c257af405d7248639ed0e3bcdce38b..3e4f493e89d831b319c585b3222004ffca5669f7:/uip/folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 3e7c85d8..fc183774 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -12,59 +12,40 @@
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
-#include <errno.h>
-
-static struct swit switches[] = {
-#define	ALLSW           0
-    { "all", 0 },
-#define NALLSW		1
-    { "noall", 0 },
-#define	CREATSW         2
-    { "create", 0 },
-#define	NCREATSW        3
-    { "nocreate", 0 },
-#define	FASTSW          4
-    { "fast", 0 },
-#define	NFASTSW         5
-    { "nofast", 0 },
-#define	HDRSW           6
-    { "header", 0 },
-#define	NHDRSW          7
-    { "noheader", 0 },
-#define	PACKSW          8
-    { "pack", 0 },
-#define	NPACKSW         9
-    { "nopack", 0 },
-#define	VERBSW         10
-    { "verbose", 0 },
-#define	NVERBSW        11
-    { "noverbose", 0 },
-#define	RECURSW        12
-    { "recurse", 0 },
-#define	NRECRSW        13
-    { "norecurse", 0 },
-#define	TOTALSW        14
-    { "total", 0 },
-#define	NTOTLSW        15
-    { "nototal", 0 },
-#define	LISTSW         16
-    { "list", 0 },
-#define	NLISTSW        17
-    { "nolist", 0 },
-#define	PRNTSW         18
-    { "print", 0 },
-#define	NPRNTSW        19
-    { "noprint", -4 },
-#define	PUSHSW         20
-    { "push", 0 },
-#define	POPSW          21
-    { "pop", 0 },
-#define VERSIONSW      22
-    { "version", 0 },
-#define	HELPSW         23
-    { "help", 0 },
-    { NULL, 0 }
-};
+
+#define FOLDER_SWITCHES \
+    X("all", 0, ALLSW) \
+    X("noall", 0, NALLSW) \
+    X("create", 0, CREATSW) \
+    X("nocreate", 0, NCREATSW) \
+    X("fast", 0, FASTSW) \
+    X("nofast", 0, NFASTSW) \
+    X("header", 0, HDRSW) \
+    X("noheader", 0, NHDRSW) \
+    X("pack", 0, PACKSW) \
+    X("nopack", 0, NPACKSW) \
+    X("verbose", 0, VERBSW) \
+    X("noverbose", 0, NVERBSW) \
+    X("recurse", 0, RECURSW) \
+    X("norecurse", 0, NRECRSW) \
+    X("total", 0, TOTALSW) \
+    X("nototal", 0, NTOTLSW) \
+    X("list", 0, LISTSW) \
+    X("nolist", 0, NLISTSW) \
+    X("print", 0, PRNTSW) \
+    X("noprint", -4, NPRNTSW) \
+    X("push", 0, PUSHSW) \
+    X("pop", 0, POPSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(FOLDER);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(FOLDER, switches);
+#undef X
 
 static int fshort   = 0;	/* output only folder names                 */
 static int fcreat   = 0;	/* should we ask to create new folders?     */
@@ -120,13 +101,7 @@ main (int argc, char **argv)
     char *cp, *dp, *msg = NULL, *argfolder = NULL;
     char **ap, **argp, buf[BUFSIZ], **arguments;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    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
@@ -151,10 +126,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [msg] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case ALLSW: 
 		    all = 1;
@@ -341,13 +316,13 @@ main (int argc, char **argv)
     /*
      * Scan the folders
      */
+    /* change directory to base of nmh directory for crawl_folders */
+    if (chdir (nmhdir) == NOTOK)
+	adios (nmhdir, "unable to change directory to");
     if (all || ftotal > 0) {
 	/*
 	 * If no folder is given, do them all
 	 */
-	/* change directory to base of nmh directory for crawl_folders */
-	if (chdir (nmhdir) == NOTOK)
-	    adios (nmhdir, "unable to change directory to");
 	if (!argfolder) {
 	    if (msg)
 		admonish (NULL, "no folder given for message %s", msg);
@@ -421,8 +396,9 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
 	/*
 	 * create message structure and get folder info
 	 */
-	if (!(mp = folder_read (fold))) {
+	if (!(mp = folder_read (fold, 1))) {
 	    admonish (NULL, "unable to read folder %s", fold);
+	    *crawl_children = FALSE;
 	    return 0;
 	}
 
@@ -431,8 +407,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     */
 	}
@@ -458,6 +436,8 @@ static boolean
 get_folder_info_callback (char *fold, void *baton)
 {
     boolean crawl_children;
+    NMH_UNUSED (baton);
+
     get_folder_info_body (fold, NULL, &crawl_children);
     fflush (stdout);
     return crawl_children;