Beginning of implementation of new argsplit() function to handle arguments

[nmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 020512d77111f421ece58af480b2dde5e8eef759..893ef8d644e09e640591fd664ff2e33856d593a0 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -20,55 +20,36 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-static struct swit switches[] = {
-#define        CHECKSW                 0
-    { "check", 0 },
-#define        NCHECKSW                1
-    { "nocheck", 0 },
-#define        DIRECTIVES              2
-    { "directives", 0 },
-#define        NDIRECTIVES             3
-    { "nodirectives", 0 },
-#define        EBCDICSW                4
-    { "ebcdicsafe", 0 },
-#define        NEBCDICSW               5
-    { "noebcdicsafe", 0 },
-#define        HEADSW                  6
-    { "headers", 0 },
-#define        NHEADSW                 7
-    { "noheaders", 0 },
-#define        LISTSW                  8
-    { "list", 0 },
-#define        NLISTSW                 9
-    { "nolist", 0 },
-#define        SIZESW                 10
-    { "realsize", 0 },
-#define        NSIZESW                11
-    { "norealsize", 0 },
-#define        RFC934SW               12
-    { "rfc934mode", 0 },
-#define        NRFC934SW              13
-    { "norfc934mode", 0 },
-#define        VERBSW                 14
-    { "verbose", 0 },
-#define        NVERBSW                15
-    { "noverbose", 0 },
-#define        RCACHESW               16
-    { "rcache policy", 0 },
-#define        WCACHESW               17
-    { "wcache policy", 0 },
-#define        CONTENTIDSW            18
-    { "contentid", 0 },
-#define        NCONTENTIDSW           19
-    { "nocontentid", 0 },
-#define VERSIONSW              20
-    { "version", 0 },
-#define        HELPSW                 21
-    { "help", 0 },
-#define        DEBUGSW                22
-    { "debug", -5 },
-    { NULL, 0 }
-};
+#define MHBUILD_SWITCHES \
+    X("check", 0, CHECKSW) \
+    X("nocheck", 0, NCHECKSW) \
+    X("directives", 0, DIRECTIVES) \
+    X("nodirectives", 0, NDIRECTIVES) \
+    X("headers", 0, HEADSW) \
+    X("noheaders", 0, NHEADSW) \
+    X("list", 0, LISTSW) \
+    X("nolist", 0, NLISTSW) \
+    X("realsize", 0, SIZESW) \
+    X("norealsize", 0, NSIZESW) \
+    X("rfc934mode", 0, RFC934SW) \
+    X("norfc934mode", 0, NRFC934SW) \
+    X("verbose", 0, VERBSW) \
+    X("noverbose", 0, NVERBSW) \
+    X("rcache policy", 0, RCACHESW) \
+    X("wcache policy", 0, WCACHESW) \
+    X("contentid", 0, CONTENTIDSW) \
+    X("nocontentid", 0, NCONTENTIDSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("debug", -5, DEBUGSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(MHBUILD);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MHBUILD, switches);
+#undef X
 
 
 /* mhbuildsbr.c */
@@ -83,7 +64,6 @@ extern char *cache_private;
 int debugsw = 0;
 int verbosw = 0;
 
-int ebcdicsw = 0;
 int listsw   = 0;
 int rfc934sw = 0;
 int contentidsw = 1;
@@ -157,10 +137,10 @@ main (int argc, char **argv)
            case HELPSW: 
                snprintf (buf, sizeof(buf), "%s [switches] file", 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;
@@ -188,13 +168,6 @@ main (int argc, char **argv)
                checksw = 0;
                continue;
 
-           case EBCDICSW:
-               ebcdicsw++;
-               continue;
-           case NEBCDICSW:
-               ebcdicsw = 0;
-               continue;
-
            case HEADSW:
                headsw++;
                continue;
@@ -254,11 +227,6 @@ main (int argc, char **argv)
            compfile = cp;
     }
 
-    set_endian ();
-
-    if ((cp = getenv ("MM_NOASK")) && !strcmp (cp, "1"))
-       listsw  = 0;
-
     /*
      * Check if we've specified an additional profile
      */