X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fshow.c;h=4abc3d74cf93a62a3b5856b1c55a3006d1c1a7e3;hp=2f5d9b43b07d7788f56b1de09e31f4ba86beb966;hb=5ee5d678d59cf1deea31126bc886333f1be4571d;hpb=ae4273126b4b7b8ebaa1454630c1b632eba8cec9

diff --git a/uip/show.c b/uip/show.c
index 2f5d9b4..4abc3d7 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -21,19 +21,15 @@ static struct swit switches[] = {
 	{ "noheader", 0 },
 #define FORMSW  4
 	{ "form formfile", 0 },
-#define PROGSW  5
-	{ "moreproc program", 0 },
-#define WIDTHSW  6
-	{ "width columns", 0 },
-#define SHOWSW  7
+#define SHOWSW  5
 	{ "showproc program", 0 },
-#define SHOWMIMESW  8
+#define SHOWMIMESW  6
 	{ "showmimeproc program", 0 },
-#define FILESW  9
-	{ "file file", -4 },  /* interface from lproc (whatnow) */
-#define VERSIONSW  10
+#define FILESW  7
+	{ "file file", -4 },  /* interface from whatnow (listproc) */
+#define VERSIONSW  8
 	{ "version", 0 },
-#define HELPSW  11
+#define HELPSW  9
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -47,6 +43,8 @@ static int is_nontext(char *);
 #define NEXT  1
 #define PREV  2
 
+char *showproc = "mhl";
+char *showmimeproc = "mhshow";
 
 int
 main(int argc, char **argv)
@@ -120,15 +118,6 @@ usage:
 				vec[vecp++] = getcpy(etcpath(cp));
 				continue;
 
-			case PROGSW:
-			case WIDTHSW:
-				vec[vecp++] = --cp;
-				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				vec[vecp++] = cp;
-				continue;
-
 			case SHOWSW:
 				if (!(showproc = *argp++) || *showproc == '-')
 					adios(NULL, "missing argument to %s",