X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c47ebdd0668b01a9227558c31febb0bd3d37f076..6bc64765f:/uip/conflict.c?ds=sidebyside

diff --git a/uip/conflict.c b/uip/conflict.c
index a3bd1d7b..4c140022 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -26,17 +26,19 @@
  */
 #define	NGRPS	100
 
-static struct swit switches[] = {
-#define	MAILSW         0
-    { "mail name", 0 },
-#define	SERCHSW        1
-    { "search directory", 0 },
-#define VERSIONSW      2
-    { "version", 0 },
-#define	HELPSW         3
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define CONFLICT_SWITCHES \
+    X("mail name", 0, MAILSW) \
+    X("search directory", 0, SERCHSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(CONFLICT);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(CONFLICT, switches);
+#undef X
 
 static char *mail = NULL;
 static char *dirs[NDIRS];
@@ -66,14 +68,7 @@ main (int argc, char **argv)
     char *cp, **argp, **arguments;
     char buf[BUFSIZ], *akv[50];
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* foil search of user profile/context */
-    if (context_foil (NULL) == -1)
-	done (1);
+    if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; }
 
     mts_init (invo_name);
     arguments = getarguments (invo_name, argc, argv, 0);
@@ -92,10 +87,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [switches] [aliasfiles ...]",
 			invo_name);
 		    print_help (buf, switches, 0);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case MAILSW: 
 		    if (!(cp = *argp++) || *cp == '-')
@@ -364,7 +359,7 @@ setup (void)
 			close (fd);
 		    }
 		execlp (mailproc, r1bindex (mailproc, '/'),
-			mail, "-subject", invo_name, NULL);
+			mail, "-subject", invo_name, (void *) NULL);
 		adios (mailproc, "unable to exec ");
 
 	    default: