X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshow.c;h=ac6b0c3e59c9fc6534b1942c1e4b67836206e20c;hp=a1fff551b36c7fa1f4b5261219a5dfc06957de74;hb=31dc797eb5178970d68962ca8939da3fd9a8efda;hpb=5b9d883db0318ed2b84bb82dee880d7381f99188

diff --git a/uip/mhshow.c b/uip/mhshow.c
index a1fff55..ac6b0c3 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -9,7 +9,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
 #include <h/tws.h>
@@ -18,50 +17,28 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 static struct swit switches[] = {
-#define CHECKSW  0
-	{ "check", 0 },
-#define NCHECKSW  1
-	{ "nocheck", 0 },
-#define SERIALSW  2
-	{ "serialonly", 0 },
-#define NSERIALSW  3
-	{ "noserialonly", 0 },
-#define VERBSW  4
+#define VERBSW  0
 	{ "verbose", 0 },
-#define NVERBSW  5
+#define NVERBSW  1
 	{ "noverbose", 0 },
-#define FILESW  6  /* interface from show */
+#define FILESW  2  /* interface from show */
 	{ "file file", 0 },
-#define FORMSW  7
+#define FORMSW  3
 	{ "form formfile", 0 },
-#define PARTSW  8
+#define PARTSW  4
 	{ "part number", 0 },
-#define TYPESW  9
+#define TYPESW  5
 	{ "type content", 0 },
-#define RCACHESW  10
+#define RCACHESW  6
 	{ "rcache policy", 0 },
-#define WCACHESW  11
+#define WCACHESW  7
 	{ "wcache policy", 0 },
-#define VERSIONSW  12
+#define VERSIONSW  8
 	{ "version", 0 },
-#define HELPSW  13
+#define HELPSW  9
 	{ "help", 0 },
-/*
-** switches for moreproc/mhlproc
-*/
-#define PROGSW  14
-	{ "moreproc program", -4 },
-#define WIDTHSW  15
-	{ "width columns", -4 },
-/*
-** switches for debugging
-*/
-#define DEBUGSW  16
+#define DEBUGSW  10
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -77,8 +54,6 @@ extern char *cache_public;
 extern char *cache_private;
 
 /* mhshowsbr.c */
-extern int serialsw;
-extern char *progsw;
 extern int nolist;
 extern char *formsw;
 
@@ -114,7 +89,7 @@ void freects_done(int) NORETURN;
 /*
 ** static prototypes
 */
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
 
 
 int
@@ -182,20 +157,6 @@ do_cache:
 				}
 				continue;
 
-			case CHECKSW:
-				checksw++;
-				continue;
-			case NCHECKSW:
-				checksw = 0;
-				continue;
-
-			case SERIALSW:
-				serialsw = 1;
-				continue;
-			case NSERIALSW:
-				serialsw = 0;
-				continue;
-
 			case PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
@@ -230,21 +191,6 @@ do_cache:
 				formsw = getcpy(etcpath(cp));
 				continue;
 
-			/*
-			** Switches for moreproc/mhlproc
-			*/
-			case PROGSW:
-				if (!(progsw = *argp++) || *progsw == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				continue;
-
-			case WIDTHSW:
-				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				continue;
-
 			case VERBSW:
 				verbosw = 1;
 				continue;
@@ -326,7 +272,7 @@ do_cache:
 			adios(NULL, "out of memory");
 		ctp = cts;
 
-		if ((ct = parse_mime(file)));
+		if ((ct = parse_mime(file)))
 			*ctp++ = ct;
 	} else {
 		/*
@@ -432,7 +378,7 @@ do_cache:
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
 	if (i == SIGQUIT) {