X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/49e0326aeef4cdc75898bf3049bfa3c123688e0f..78211e93:/uip/prompter.c?ds=sidebyside

diff --git a/uip/prompter.c b/uip/prompter.c
index 981e8201..d950163d 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -26,33 +26,27 @@
 # define CERASE '#'
 #endif
 
-static struct swit switches[] = {
-#define	ERASESW	0
-    { "erase chr", 0 },
-#define	KILLSW	1
-    { "kill chr", 0 },
-#define	PREPSW	2
-    { "prepend", 0 },
-#define	NPREPSW	3
-    { "noprepend", 0 },	
-#define	RAPDSW	4
-    { "rapid", 0 },
-#define	NRAPDSW	5
-    { "norapid", 0 },
-#define	BODYSW	6
-    { "body", -4 },
-#define	NBODYSW	7
-    { "nobody", -6 },
-#define	DOTSW	8
-    { "doteof", 0 },
-#define	NDOTSW	9
-    { "nodoteof", 0 },
-#define VERSIONSW 10
-    { "version", 0 },
-#define	HELPSW	11
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define PROMPTER_SWITCHES \
+    X("erase chr", 0, ERASESW) \
+    X("kill chr", 0, KILLSW) \
+    X("prepend", 0, PREPSW) \
+    X("noprepend", 0, NPREPSW) \
+    X("rapid", 0, RAPDSW) \
+    X("norapid", 0, NRAPDSW) \
+    X("body", -4, BODYSW) \
+    X("nobody", -6, NBODYSW) \
+    X("doteof", 0, DOTSW) \
+    X("nodoteof", 0, NDOTSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(PROMPTER);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(PROMPTER, switches);
+#undef X
 
 
 static struct termios tio;
@@ -109,10 +103,10 @@ main (int argc, char **argv)
 		    snprintf (buffer, sizeof(buffer), "%s [switches] file",
 			invo_name);
 		    print_help (buffer, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case ERASESW: 
 		    if (!(erasep = *argp++) || *erasep == '-')