X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/56a805299de35d8924969138aef4d0f1580daa6d..c4c53777458bfcfd288d45b7708e52eb47c56405:/uip/mhlist.c?ds=sidebyside

diff --git a/uip/mhlist.c b/uip/mhlist.c
index bcc4dd2b..1363081c 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -2,8 +2,6 @@
 /*
  * mhlist.c -- list the contents of MIME messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -22,53 +20,34 @@
 #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	HEADSW                  2
-    { "headers", 0 },
-#define	NHEADSW                 3
-    { "noheaders", 0 },
-#define	SIZESW                  4
-    { "realsize", 0 },
-#define	NSIZESW                 5
-    { "norealsize", 0 },
-#define	VERBSW                  6
-    { "verbose", 0 },
-#define	NVERBSW                 7
-    { "noverbose", 0 },
-#define	FILESW                  8	/* interface from show */
-    { "file file", 0 },
-#define	PARTSW                  9
-    { "part number", 0 },
-#define	TYPESW                 10
-    { "type content", 0 },
-#define	RCACHESW               11
-    { "rcache policy", 0 },
-#define	WCACHESW               12
-    { "wcache policy", 0 },
-#define VERSIONSW              13
-    { "version", 0 },
-#define	HELPSW                 14
-    { "help", 0 },
-
-/*
- * switches for debugging
- */
-#define	DEBUGSW                15
-    { "debug", -5 },
-    { NULL, 0 }
-};
+#define MHLIST_SWITCHES \
+    X("check", 0, CHECKSW) \
+    X("nocheck", 0, NCHECKSW) \
+    X("headers", 0, HEADSW) \
+    X("noheaders", 0, NHEADSW) \
+    X("realsize", 0, SIZESW) \
+    X("norealsize", 0, NSIZESW) \
+    X("verbose", 0, VERBSW) \
+    X("noverbose", 0, NVERBSW) \
+    X("file file", 0, FILESW) \
+    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(MHLIST);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MHLIST, switches);
+#undef X
 
 
 /* mhparse.c */
-extern int checksw;
 extern char *tmp;	/* directory to place temp files */
 
 /* mhcachesbr.c */
@@ -93,9 +72,6 @@ pid_t xpid  = 0;
 int debugsw = 0;
 int verbosw = 0;
 
-/* The list of top-level contents to display */
-CT *cts = NULL;
-
 #define	quitser	pipeser
 
 /* mhparse.c */
@@ -104,7 +80,6 @@ CT parse_mime (char *);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
-void set_endian (void);
 void flush_errors (void);
 
 /* mhlistsbr.c */
@@ -112,12 +87,13 @@ void list_all_messages (CT *, int, int, int, int);
 
 /* mhfree.c */
 void free_content (CT);
+extern CT *cts;
+void freects_done (int) NORETURN;
 
 /*
  * static prototypes
  */
-static RETSIGTYPE pipeser (int);
-static int freectp_done (int);
+static void pipeser (int);
 
 
 int
@@ -132,7 +108,7 @@ main (int argc, char **argv)
     struct msgs *mp = NULL;
     CT ct, *ctp;
 
-    done=freectp_done;
+    done=freects_done;
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
@@ -161,10 +137,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;
@@ -254,8 +230,6 @@ do_cache:
     parts[npart] = NULL;
     types[ntype] = NULL;
 
-    set_endian ();
-
     /* Check for public cache location */
     if ((cache_public = context_find (nmhcache)) && *cache_public != '/')
 	cache_public = NULL;
@@ -289,7 +263,7 @@ do_cache:
 	    adios (NULL, "out of memory");
 	ctp = cts;
 
-	if ((ct = parse_mime (file)));
+	if ((ct = parse_mime (file)))
 	    *ctp++ = ct;
     } else {
 	/*
@@ -375,11 +349,12 @@ do_cache:
 	context_save ();		  /* save the context file  */
     }
 
-    return done (0);
+    done (0);
+    return 1;
 }
 
 
-static RETSIGTYPE
+static void
 pipeser (int i)
 {
     if (i == SIGQUIT) {
@@ -392,17 +367,3 @@ pipeser (int i)
     done (1);
     /* NOTREACHED */
 }
-
-
-static int
-freectp_done (int status)
-{
-    CT *ctp;
-
-    if ((ctp = cts))
-	for (; *ctp; ctp++)
-	    free_content (*ctp);
-
-    exit (status);
-    return 1;  /* dead code to satisfy the compiler */
-}