X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshow.c;h=4a07d016b384dd66a9ba10476fe29623daab36d8;hb=ac0b9fcce4167e2959ebc5b8d6efb8511acec66d;hp=1f37c0e8ac0564ae1d34e6676bffefbb134771be;hpb=a4605f68e8ff04d4539e402a6fb00ff188944e1c;p=mmh

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 1f37c0e..4a07d01 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -12,17 +12,12 @@
 #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>
 #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 },
@@ -52,23 +47,10 @@ static struct swit switches[] = {
 	{ "version", 0 },
 #define HELPSW  13
 	{ "help", 0 },
-
-/*
-** switches for moreproc/mhlproc
-*/
-#define PROGSW  16
-	{ "moreproc program", -4 },
-#define NPROGSW  17
-	{ "nomoreproc", -3 },
-#define LENSW  18
-	{ "length lines", -4 },
-#define WIDTHSW  19
-	{ "width columns", -4 },
-
 /*
 ** switches for debugging
 */
-#define DEBUGSW  20
+#define DEBUGSW  14
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -85,9 +67,7 @@ extern char *cache_private;
 
 /* mhshowsbr.c */
 extern int serialsw;
-extern char *progsw;
 extern int nolist;
-extern int nomore;  /* flags for moreproc/header display */
 extern char *formsw;
 
 /* mhmisc.c */
@@ -122,7 +102,7 @@ void freects_done(int) NORETURN;
 /*
 ** static prototypes
 */
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
 
 
 int
@@ -238,25 +218,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 NPROGSW:
-				nomore++;
-				continue;
-
-			case LENSW:
-			case WIDTHSW:
-				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				continue;
-
 			case VERBSW:
 				verbosw = 1;
 				continue;
@@ -338,7 +299,7 @@ do_cache:
 			adios(NULL, "out of memory");
 		ctp = cts;
 
-		if ((ct = parse_mime(file)));
+		if ((ct = parse_mime(file)))
 			*ctp++ = ct;
 	} else {
 		/*
@@ -444,7 +405,7 @@ do_cache:
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
 	if (i == SIGQUIT) {