X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshow.c;h=a1fff551b36c7fa1f4b5261219a5dfc06957de74;hp=5d5ac3e4a24b894349a2b4a4846068c7e0917523;hb=ffe93d6dc707aaf92529cefb38a1814956b48c9e;hpb=3cc8ed080f6e741b8df04a3ebe764c659e75cb38

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 5d5ac3e..a1fff55 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -12,7 +12,6 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
@@ -28,51 +27,41 @@ static struct swit switches[] = {
 	{ "check", 0 },
 #define NCHECKSW  1
 	{ "nocheck", 0 },
-#define PAUSESW  2
-	{ "pause", 0 },
-#define NPAUSESW  3
-	{ "nopause", 0 },
-#define SERIALSW  4
+#define SERIALSW  2
 	{ "serialonly", 0 },
-#define NSERIALSW  5
+#define NSERIALSW  3
 	{ "noserialonly", 0 },
-#define VERBSW  6
+#define VERBSW  4
 	{ "verbose", 0 },
-#define NVERBSW  7
+#define NVERBSW  5
 	{ "noverbose", 0 },
-#define FILESW  8  /* interface from show */
+#define FILESW  6  /* interface from show */
 	{ "file file", 0 },
-#define FORMSW  9
+#define FORMSW  7
 	{ "form formfile", 0 },
-#define PARTSW  10
+#define PARTSW  8
 	{ "part number", 0 },
-#define TYPESW  11
+#define TYPESW  9
 	{ "type content", 0 },
-#define RCACHESW  12
+#define RCACHESW  10
 	{ "rcache policy", 0 },
-#define WCACHESW  13
+#define WCACHESW  11
 	{ "wcache policy", 0 },
-#define VERSIONSW  14
+#define VERSIONSW  12
 	{ "version", 0 },
-#define HELPSW  15
+#define HELPSW  13
 	{ "help", 0 },
-
 /*
 ** switches for moreproc/mhlproc
 */
-#define PROGSW  16
+#define PROGSW  14
 	{ "moreproc program", -4 },
-#define NPROGSW  17
-	{ "nomoreproc", -3 },
-#define LENSW  18
-	{ "length lines", -4 },
-#define WIDTHSW  19
+#define WIDTHSW  15
 	{ "width columns", -4 },
-
 /*
 ** switches for debugging
 */
-#define DEBUGSW  20
+#define DEBUGSW  16
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -88,11 +77,9 @@ extern char *cache_public;
 extern char *cache_private;
 
 /* mhshowsbr.c */
-extern int pausesw;
 extern int serialsw;
 extern char *progsw;
 extern int nolist;
-extern int nomore;  /* flags for moreproc/header display */
 extern char *formsw;
 
 /* mhmisc.c */
@@ -202,13 +189,6 @@ do_cache:
 				checksw = 0;
 				continue;
 
-			case PAUSESW:
-				pausesw = 1;
-				continue;
-			case NPAUSESW:
-				pausesw = 0;
-				continue;
-
 			case SERIALSW:
 				serialsw = 1;
 				continue;
@@ -258,11 +238,7 @@ do_cache:
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
-			case NPROGSW:
-				nomore++;
-				continue;
 
-			case LENSW:
 			case WIDTHSW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
@@ -295,9 +271,8 @@ do_cache:
 
 	set_endian();
 
-	if ((cp = getenv("MM_NOASK")) && !strcmp(cp, "1")) {
+	if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0) {
 		nolist  = 1;
-		pausesw = 0;
 	}
 
 	/*