X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fcomp.c;h=680c0fc91fde4338267f7cb95543696ba9026b12;hp=87953ad278baf3fd8883eced99ce5fc7cbaad5ac;hb=5f2b39344cca1086c975d47b730929d8f1904214;hpb=d5b5e6e4813b7fd77dc1664df4304537f3002cf3

diff --git a/uip/comp.c b/uip/comp.c
index 87953ad..680c0fc 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -13,21 +13,17 @@
 static struct swit switches[] = {
 #define EDITRSW  0
 	{ "editor editor", 0 },
-#define NEDITSW  1
-	{ "noedit", 0 },
-#define FORMSW  2
+#define FORMSW  1
 	{ "form formfile", 0 },
-#define USESW  3
+#define USESW  2
 	{ "use", 0 },
-#define NUSESW  4
-	{ "nouse", 0 },
-#define WHATSW  5
+#define NUSESW  3
+	{ "nouse", 2 },
+#define WHATSW  4
 	{ "whatnowproc program", 0 },
-#define NWHATSW  6
-	{ "nowhatnowproc", 0 },
-#define VERSIONSW  7
-	{ "version", 0 },
-#define HELPSW  8
+#define VERSIONSW  5
+	{ "Version", 0 },
+#define HELPSW  6
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -36,7 +32,7 @@ static struct swit switches[] = {
 int
 main(int argc, char **argv)
 {
-	int use = NOUSE, nedit = 0, nwhat = 0;
+	int use = NOUSE;
 	int in, out;
 	char *cp, *cwd, *maildir;
 	char *ed = NULL, *form = NULL;
@@ -77,19 +73,11 @@ main(int argc, char **argv)
 			case EDITRSW:
 				if (!(ed = *argp++) || *ed == '-')
 					adios(NULL, "missing argument to %s", argp[-2]);
-				nedit = 0;
-				continue;
-			case NEDITSW:
-				nedit++;
 				continue;
 
 			case WHATSW:
 				if (!(whatnowproc = *argp++) || *whatnowproc == '-')
 					adios(NULL, "missing argument to %s", argp[-2]);
-				nwhat = 0;
-				continue;
-			case NWHATSW:
-				nwhat++;
 				continue;
 
 			case FORMSW:
@@ -176,11 +164,7 @@ main(int argc, char **argv)
 	}
 
 	context_save();
-
-	if (nwhat) {
-		done(0);
-	}
-	what_now(ed, nedit, use, drft, NULL, 0, NULLMP, NULL, cwd);
+	what_now(ed, use, drft, NULL, 0, NULLMP, NULL, cwd);
 	done(1);
 	return 1;
 }