X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshow.c;h=53f96f242afa792bfcf2a61801fe77ef2aa31033;hb=d1fefd9f614e4dc3cda16da6c69133c1b2005269;hp=b1f3d3d0d9e5a328734e8ad983633d7c50175ff8;hpb=d3ba09a465cb0e5fc9a74d0b152a7ed965f895cb;p=mmh

diff --git a/uip/mhshow.c b/uip/mhshow.c
index b1f3d3d..53f96f2 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -9,70 +9,31 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#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 },
-#define NCHECKSW  1
-	{ "nocheck", 0 },
-#define PAUSESW  2
-	{ "pause", 0 },
-#define NPAUSESW  3
-	{ "nopause", 0 },
-#define SERIALSW  4
-	{ "serialonly", 0 },
-#define NSERIALSW  5
-	{ "noserialonly", 0 },
-#define VERBSW  6
+#define VERBSW  0
 	{ "verbose", 0 },
-#define NVERBSW  7
+#define NVERBSW  1
 	{ "noverbose", 0 },
-#define FILESW  8  /* interface from show */
+#define FILESW  2  /* interface from show */
 	{ "file file", 0 },
-#define FORMSW  9
+#define FORMSW  3
 	{ "form formfile", 0 },
-#define PARTSW  10
+#define PARTSW  4
 	{ "part number", 0 },
-#define TYPESW  11
+#define TYPESW  5
 	{ "type content", 0 },
-#define RCACHESW  12
-	{ "rcache policy", 0 },
-#define WCACHESW  13
-	{ "wcache policy", 0 },
-#define VERSIONSW  14
+#define VERSIONSW  6
 	{ "version", 0 },
-#define HELPSW  15
+#define HELPSW  7
 	{ "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  8
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -81,18 +42,8 @@ static struct swit switches[] = {
 /* mhparse.c */
 extern char *tmp;  /* directory to place temp files */
 
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-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 */
@@ -127,13 +78,13 @@ void freects_done(int) NORETURN;
 /*
 ** static prototypes
 */
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
 
 
 int
 main(int argc, char **argv)
 {
-	int msgnum, *icachesw;
+	int msgnum;
 	char *cp, *file = NULL, *folder = NULL;
 	char *maildir, buf[100], **argp;
 	char **arguments;
@@ -175,47 +126,6 @@ main(int argc, char **argv)
 				print_version(invo_name);
 				done(1);
 
-			case RCACHESW:
-				icachesw = &rcachesw;
-				goto do_cache;
-			case WCACHESW:
-				icachesw = &wcachesw;
-do_cache:
-				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				switch (*icachesw = smatch(cp, caches)) {
-				case AMBIGSW:
-					ambigsw(cp, caches);
-					done(1);
-				case UNKWNSW:
-					adios(NULL, "%s unknown", cp);
-				default:
-					break;
-				}
-				continue;
-
-			case CHECKSW:
-				checksw++;
-				continue;
-			case NCHECKSW:
-				checksw = 0;
-				continue;
-
-			case PAUSESW:
-				pausesw = 1;
-				continue;
-			case NPAUSESW:
-				pausesw = 0;
-				continue;
-
-			case SERIALSW:
-				serialsw = 1;
-				continue;
-			case NSERIALSW:
-				serialsw = 0;
-				continue;
-
 			case PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
@@ -250,25 +160,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;
@@ -297,7 +188,6 @@ do_cache:
 
 	if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0) {
 		nolist  = 1;
-		pausesw = 0;
 	}
 
 	/*
@@ -321,15 +211,6 @@ do_cache:
 		fclose(fp);
 	}
 
-	/* Check for public cache location */
-	if ((cache_public = context_find(nmhcache)) && *cache_public != '/')
-		cache_public = NULL;
-
-	/* Check for private cache location */
-	if (!(cache_private = context_find(nmhprivcache)))
-		cache_private = ".cache";
-	cache_private = getcpy(toabsdir(cache_private));
-
 	/*
 	** Check for storage directory.  If specified,
 	** then store temporary files there.  Else we
@@ -351,7 +232,7 @@ do_cache:
 			adios(NULL, "out of memory");
 		ctp = cts;
 
-		if ((ct = parse_mime(file)));
+		if ((ct = parse_mime(file)))
 			*ctp++ = ct;
 	} else {
 		/*
@@ -457,7 +338,7 @@ do_cache:
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
 	if (i == SIGQUIT) {