In m_getfld.c, cast the returns of valid characters to

[nmh] / uip / mhtest.c

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 5e6494a201006f6212cc86d60a8c4d1068a614a6..cf7f8642419520b91196e71b4a7b5d95cae31ce3 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -2,8 +2,6 @@
 /*
  * mhtest.c -- test harness for MIME routines
  *
- * $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,49 +20,31 @@
 #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 int checksw;
 extern char *tmp;      /* directory to place temp files */
 
 /* mhcachesbr.c */
@@ -89,9 +69,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 */
@@ -103,17 +80,17 @@ 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;
 
 /*
  * static prototypes
  */
 static int write_content (CT *, char *);
-static RETSIGTYPE pipeser (int);
+static void pipeser (int);
 
 
 int
@@ -127,6 +104,8 @@ main (int argc, char **argv)
     struct msgs *mp = NULL;
     CT ct, *ctp;
 
+    done=freects_done;
+
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
@@ -154,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;
@@ -239,8 +218,6 @@ do_cache:
     parts[npart] = NULL;
     types[ntype] = NULL;
 
-    set_endian ();
-
     if (outfile == NULL)
        adios (NULL, "must specify output file");
 
@@ -277,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 {
        /*
@@ -363,7 +340,8 @@ do_cache:
        context_save ();                  /* save the context file  */
     }
 
-    return done (0);
+    done (0);
+    return 1;
 }
 
 
@@ -382,7 +360,7 @@ write_content (CT *cts, char *outfile)
 }
 
 
-static RETSIGTYPE
+static void
 pipeser (int i)
 {
     if (i == SIGQUIT) {
@@ -395,17 +373,3 @@ pipeser (int i)
     done (1);
     /* NOTREACHED */
 }
-
-
-int
-done (int status)
-{
-    CT *ctp;
-
-    if ((ctp = cts))
-       for (; *ctp; ctp++)
-           free_content (*ctp);
-
-    exit (status);
-    return 1;  /* dead code to satisfy the compiler */
-}