X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2..7559e1ebf:/uip/install-mh.c?ds=sidebyside

diff --git a/uip/install-mh.c b/uip/install-mh.c
index ec847fb4..12377352 100644
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -1,8 +1,6 @@
 /*
  * install-mh.c -- initialize the nmh environment of a new user
  *
- * $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.
@@ -12,17 +10,19 @@
 #include <h/utils.h>
 #include <pwd.h>				/* structure for getpwuid() results */
 
-static struct swit switches[] = {
-#define AUTOSW     0
-    { "auto", 0 },
-#define VERSIONSW  1
-    { "version", 0 },
-#define HELPSW     2
-    { "help", 0 },
-#define CHECKSW     3
-    { "check", 1 },
-    { NULL, 0 }
-};
+#define INSTALLMH_SWITCHES \
+    X("auto", 0, AUTOSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("check", 1, CHECKSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(INSTALLMH);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(INSTALLMH, switches);
+#undef X
 
 /*
  * static prototypes
@@ -42,10 +42,8 @@ main (int argc, char **argv)
     FILE *in, *out;
     int		check;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], 0 /* use context_foil() */ )) { return 1; }
+
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
 
@@ -63,10 +61,10 @@ main (int argc, char **argv)
 		case HELPSW:
 		    snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
 		    print_help (buf, switches, 0);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case AUTOSW:
 		    autof++;
@@ -213,7 +211,8 @@ query:
 	    fprintf (out, "%s: %s\n", np->n_name, np->n_field);
     }
     fclose (out);
-    return done (0);
+    done (0);
+    return 1;
 }