Require at least 2 chars for `no' variants of switches.

[mmh] / uip / mhlist.c

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 99b2cc7..e507127 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -17,29 +17,21 @@
 #include <h/utils.h>
 
 static struct swit switches[] = {
-#define HEADSW  0
-       { "headers", 0 },
-#define NHEADSW  1
-       { "noheaders", 0 },
-#define SIZESW  2
-       { "realsize", 0 },
-#define NSIZESW  3
-       { "norealsize", 0 },
-#define VERBSW  4
+#define VERBSW  0
        { "verbose", 0 },
-#define NVERBSW  5
-       { "noverbose", 0 },
-#define FILESW  6  /* interface from show */
+#define NVERBSW  1
+       { "noverbose", 2 },
+#define FILESW  2  /* interface from show */
        { "file file", 0 },
-#define PARTSW  7
+#define PARTSW  3
        { "part number", 0 },
-#define TYPESW  8
+#define TYPESW  4
        { "type content", 0 },
-#define VERSIONSW  9
-       { "version", 0 },
-#define HELPSW  10
+#define VERSIONSW  5
+       { "Version", 0 },
+#define HELPSW  6
        { "help", 0 },
-#define DEBUGSW  11
+#define DEBUGSW  7
        { "debug", -5 },
        { NULL, 0 }
 };
@@ -76,7 +68,7 @@ void set_endian(void);
 void flush_errors(void);
 
 /* mhlistsbr.c */
-void list_all_messages(CT *, int, int, int, int);
+void list_all_messages(CT *, int, int);
 
 /* mhfree.c */
 void free_content(CT);
@@ -92,7 +84,6 @@ static void pipeser(int);
 int
 main(int argc, char **argv)
 {
-       int sizesw = 1, headsw = 1;
        int msgnum;
        char *cp, *file = NULL, *folder = NULL;
        char *maildir, buf[100], **argp;
@@ -134,20 +125,6 @@ main(int argc, char **argv)
                                print_version(invo_name);
                                done(1);
 
-                       case HEADSW:
-                               headsw = 1;
-                               continue;
-                       case NHEADSW:
-                               headsw = 0;
-                               continue;
-
-                       case SIZESW:
-                               sizesw = 1;
-                               continue;
-                       case NSIZESW:
-                               sizesw = 0;
-                               continue;
-
                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",
@@ -290,7 +267,7 @@ main(int argc, char **argv)
        /*
        ** List the message content
        */
-       list_all_messages(cts, headsw, sizesw, verbosw, debugsw);
+       list_all_messages(cts, verbosw, debugsw);
 
        /* Now free all the structures for the content */
        for (ctp = cts; *ctp; ctp++)