X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5dd6771b28c257af405d7248639ed0e3bcdce38b..c0a87b2e2dfa156bfb4e6c0e5d43f7a582f779fc:/uip/mhtest.c?ds=inline

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 5c10b8bc..aa6d8e43 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -20,47 +20,30 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-static struct swit switches[] = {
-#define	CHECKSW                 0
-    { "check", 0 },
-#define	NCHECKSW                1
-    { "nocheck", 0 },
-#define	VERBSW                  2
-    { "verbose", 0 },
-#define	NVERBSW                 3
-    { "noverbose", 0 },
-#define	FILESW                  4
-    { "file file", 0 },
-#define OUTFILESW               5
-    { "outfile file", 0 },
-#define	PARTSW                  6
-    { "part number", 0 },
-#define	TYPESW                  7
-    { "type content", 0 },
-#define	RCACHESW                8
-    { "rcache policy", 0 },
-#define	WCACHESW                9
-    { "wcache policy", 0 },
-#define VERSIONSW              10
-    { "version", 0 },
-#define	HELPSW                 11
-    { "help", 0 },
-
-/*
- * switches for debugging
- */
-#define	DEBUGSW                12
-    { "debug", -5 },
-    { NULL, 0 }
-};
+#define MHTEST_SWITCHES \
+    X("check", 0, CHECKSW) \
+    X("nocheck", 0, NCHECKSW) \
+    X("verbose", 0, VERBSW) \
+    X("noverbose", 0, NVERBSW) \
+    X("file file", 0, FILESW) \
+    X("outfile file", 0, OUTFILESW) \
+    X("part number", 0, PARTSW) \
+    X("type content", 0, TYPESW) \
+    X("rcache policy", 0, RCACHESW) \
+    X("wcache policy", 0, WCACHESW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("debug", -5, DEBUGSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(MHTEST);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MHTEST, switches);
+#undef X
 
 
-int ebcdicsw = 0;	/* hack for linking purposes */
-
 /* mhparse.c */
 extern char *tmp;	/* directory to place temp files */
 
@@ -97,11 +80,9 @@ int output_message (CT, char *);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
-void set_endian (void);
 void flush_errors (void);
 
 /* mhfree.c */
-void free_content (CT);
 extern CT *cts;
 void freects_done (int) NORETURN;
 
@@ -109,7 +90,7 @@ void freects_done (int) NORETURN;
  * static prototypes
  */
 static int write_content (CT *, char *);
-static RETSIGTYPE pipeser (int);
+static void pipeser (int);
 
 
 int
@@ -152,10 +133,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case RCACHESW:
 		icachesw = &rcachesw;
@@ -237,8 +218,6 @@ do_cache:
     parts[npart] = NULL;
     types[ntype] = NULL;
 
-    set_endian ();
-
     if (outfile == NULL)
 	adios (NULL, "must specify output file");
 
@@ -275,7 +254,7 @@ do_cache:
 	    adios (NULL, "out of memory");
 	ctp = cts;
 
-	if ((ct = parse_mime (file)));
+	if ((ct = parse_mime (file)))
 	    *ctp++ = ct;
     } else {
 	/*
@@ -291,7 +270,7 @@ do_cache:
 	    adios (maildir, "unable to change directory to");
 
 	/* read folder and create message structure */
-	if (!(mp = folder_read (folder)))
+	if (!(mp = folder_read (folder, 1)))
 	    adios (NULL, "unable to read folder %s", folder);
 
 	/* check for empty folder */
@@ -381,7 +360,7 @@ write_content (CT *cts, char *outfile)
 }
 
 
-static RETSIGTYPE
+static void
 pipeser (int i)
 {
     if (i == SIGQUIT) {