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

diff --git a/uip/mhshow.c b/uip/mhshow.c
index b43d5a8..53f96f2 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -9,45 +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/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
-#include <h/mhcachesbr.h>
 #include <h/utils.h>
 
 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
-	{ "rcache policy", 0 },
-#define WCACHESW  11
-	{ "wcache policy", 0 },
-#define VERSIONSW  12
+#define VERSIONSW  6
 	{ "version", 0 },
-#define HELPSW  13
+#define HELPSW  7
 	{ "help", 0 },
-#define DEBUGSW  14
+#define DEBUGSW  8
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -56,14 +42,7 @@ 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 serialsw;
 extern int nolist;
 extern char *formsw;
 
@@ -105,7 +84,7 @@ 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;
@@ -147,40 +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 SERIALSW:
-				serialsw = 1;
-				continue;
-			case NSERIALSW:
-				serialsw = 0;
-				continue;
-
 			case PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
@@ -266,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