X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhstore.c;h=ed36c9603075083f7c61ea7cf326649d907c5183;hp=2ed6a42b7d5985c2167f6b0f5f8c75fa5d092223;hb=d1fefd9f614e4dc3cda16da6c69133c1b2005269;hpb=f0f858069d21111f0dbea510044593f89c9b0829

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 2ed6a42..ed36c96 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -9,52 +9,30 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <h/md5.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.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 AUTOSW  0
 	{ "auto", 0 },
 #define NAUTOSW  1
 	{ "noauto", 0 },
-#define CHECKSW  2
-	{ "check", 0 },
-#define NCHECKSW  3
-	{ "nocheck", 0 },
-#define VERBSW  4
-	{ "verbose", 0 },
-#define NVERBSW  5
-	{ "noverbose", 0 },
-#define FILESW  6  /* interface from show */
+#define FILESW  2  /* interface from show */
 	{ "file file", 0 },
-#define PARTSW  7
+#define PARTSW  3
 	{ "part number", 0 },
-#define TYPESW  8
+#define TYPESW  4
 	{ "type content", 0 },
-#define RCACHESW  9
-	{ "rcache policy", 0 },
-#define WCACHESW  10
-	{ "wcache policy", 0 },
-#define VERSIONSW  11
+#define VERSIONSW  5
 	{ "version", 0 },
-#define HELPSW  12
+#define HELPSW  6
 	{ "help", 0 },
-
-/*
-** switches for debugging
-*/
-#define DEBUGSW  13
+#define DEBUGSW  7
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -63,12 +41,6 @@ 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;
-
 /* mhmisc.c */
 extern int npart;
 extern int ntype;
@@ -77,7 +49,6 @@ extern char *types[NTYPES + 1];
 extern int userrs;
 
 int debugsw = 0;
-int verbosw = 0;
 
 #define quitser pipeser
 
@@ -98,7 +69,7 @@ void freects_done(int) NORETURN;
 /*
 ** static prototypes
 */
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
 
 int autosw = 0;
 
@@ -127,7 +98,7 @@ int make_intermediates(char *);
 void flush_errors(void);
 
 /* mhshowsbr.c */
-int show_content_aux(CT, int, int, char *, char *);
+int show_content_aux(CT, int, char *, char *);
 
 /*
 ** static prototypes
@@ -152,7 +123,7 @@ static void store_all_messages(CT *);
 int
 main(int argc, char **argv)
 {
-	int msgnum, *icachesw;
+	int msgnum;
 	char *cp, *file = NULL, *folder = NULL;
 	char *maildir, buf[100], **argp;
 	char **arguments;
@@ -201,33 +172,6 @@ main(int argc, char **argv)
 				autosw = 0;
 				continue;
 
-			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 PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
@@ -253,12 +197,6 @@ do_cache:
 				file = *cp == '-' ? cp : getcpy(expanddir(cp));
 				continue;
 
-			case VERBSW:
-				verbosw = 1;
-				continue;
-			case NVERBSW:
-				verbosw = 0;
-				continue;
 			case DEBUGSW:
 				debugsw = 1;
 				continue;
@@ -300,15 +238,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));
-
 	/*
 	** Cache the current directory before we do any chdirs()'s.
 	*/
@@ -335,7 +264,7 @@ do_cache:
 			adios(NULL, "out of memory");
 		ctp = cts;
 
-		if ((ct = parse_mime(file)));
+		if ((ct = parse_mime(file)))
 			*ctp++ = ct;
 	} else {
 		/*
@@ -427,7 +356,7 @@ do_cache:
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
 	if (i == SIGQUIT) {
@@ -457,7 +386,7 @@ store_all_messages(CT *cts)
 	*/
 	if (autosw)
 		dir = getcpy(cwd);
-	else if ((cp = context_find(nmhstorage)) && *cp)
+	if ((cp = context_find(nmhstorage)) && *cp)
 		dir = getcpy(cp);
 	else
 		dir = getcpy(cwd);
@@ -943,7 +872,7 @@ store_content(CT ct, CT p)
 	** content to standard input of a command and return.
 	*/
 	if (buffer[0] == '|' || buffer[0] == '!')
-		return show_content_aux(ct, 1, 0, buffer + 1, dir);
+		return show_content_aux(ct, 0, buffer + 1, dir);
 
 	/* record the filename */
 	ct->c_storage = getcpy(buffer);