Renamed -version switch to -Version to remove the conflict with -verbose.

[mmh] / uip / mhtest.c

diff --git a/uip/mhtest.c b/uip/mhtest.c
index dc38126..871270e 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -9,61 +9,39 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
-#include <h/mhcachesbr.h>
 #include <h/utils.h>
 
 static struct swit switches[] = {
-#define CHECKSW  0
-       { "check", 0 },
-#define NCHECKSW  1
-       { "nocheck", 0 },
-#define VERBSW  2
+#define VERBSW  0
        { "verbose", 0 },
-#define NVERBSW  3
+#define NVERBSW  1
        { "noverbose", 0 },
-#define FILESW  4
+#define FILESW  2
        { "file file", 0 },
-#define OUTFILESW  5
+#define OUTFILESW  3
        { "outfile file", 0 },
-#define PARTSW  6
+#define PARTSW  4
        { "part number", 0 },
-#define TYPESW  7
+#define TYPESW  5
        { "type content", 0 },
-#define RCACHESW  8
-       { "rcache policy", 0 },
-#define WCACHESW  9
-       { "wcache policy", 0 },
-#define VERSIONSW  10
-       { "version", 0 },
-#define HELPSW  11
+#define VERSIONSW  6
+       { "Version", 0 },
+#define HELPSW  7
        { "help", 0 },
-
-/*
-** switches for debugging
-*/
-#define DEBUGSW  12
+#define DEBUGSW  8
        { "debug", -5 },
        { NULL, 0 }
 };
 
 
-int ebcdicsw = 0;  /* hack for linking purposes */
-
 /* mhparse.c */
 extern char *tmp;  /* directory to place temp files */
 
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
 /* mhmisc.c */
 extern int npart;
 extern int ntype;
@@ -103,13 +81,13 @@ void freects_done(int) NORETURN;
 ** static prototypes
 */
 static int write_content(CT *, char *);
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
 
 
 int
 main(int argc, char **argv)
 {
-       int msgnum, *icachesw;
+       int msgnum;
        char *cp, *file = NULL, *folder = NULL;
        char *maildir, buf[100], *outfile = NULL;
        char **argp, **arguments;
@@ -150,33 +128,6 @@ main(int argc, char **argv)
                                print_version(invo_name);
                                done(1);
 
-                       case RCACHESW:
-                               icachesw = &rcachesw;
-                               goto do_cache;
-                       case WCACHESW:
-                               icachesw = &wcachesw;
-do_cache:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               switch (*icachesw = smatch(cp, caches)) {
-                               case AMBIGSW:
-                                       ambigsw(cp, caches);
-                                       done(1);
-                               case UNKWNSW:
-                                       adios(NULL, "%s unknown", cp);
-                               default:
-                                       break;
-                               }
-                               continue;
-
-                       case CHECKSW:
-                               checksw++;
-                               continue;
-                       case NCHECKSW:
-                               checksw = 0;
-                               continue;
-
                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s", argp[-2]);
@@ -237,15 +188,6 @@ do_cache:
        if (outfile == NULL)
                adios(NULL, "must specify output file");
 
-       /* Check for public cache location */
-       if ((cache_public = context_find(nmhcache)) && *cache_public != '/')
-               cache_public = NULL;
-
-       /* Check for private cache location */
-       if (!(cache_private = context_find(nmhprivcache)))
-               cache_private = ".cache";
-       cache_private = getcpy(toabsdir(cache_private));
-
        /*
        ** Check for storage directory.  If specified,
        ** then store temporary files there.  Else we
@@ -374,7 +316,7 @@ write_content(CT *cts, char *outfile)
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
        if (i == SIGQUIT) {