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

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 2ed6a42..ea35f8e 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -19,10 +19,6 @@
 #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 },
@@ -32,29 +28,21 @@ static struct swit switches[] = {
 	{ "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  4  /* interface from show */
 	{ "file file", 0 },
-#define PARTSW  7
+#define PARTSW  5
 	{ "part number", 0 },
-#define TYPESW  8
+#define TYPESW  6
 	{ "type content", 0 },
-#define RCACHESW  9
+#define RCACHESW  7
 	{ "rcache policy", 0 },
-#define WCACHESW  10
+#define WCACHESW  8
 	{ "wcache policy", 0 },
-#define VERSIONSW  11
+#define VERSIONSW  9
 	{ "version", 0 },
-#define HELPSW  12
+#define HELPSW  10
 	{ "help", 0 },
-
-/*
-** switches for debugging
-*/
-#define DEBUGSW  13
+#define DEBUGSW  11
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -77,7 +65,6 @@ extern char *types[NTYPES + 1];
 extern int userrs;
 
 int debugsw = 0;
-int verbosw = 0;
 
 #define quitser pipeser
 
@@ -98,7 +85,7 @@ void freects_done(int) NORETURN;
 /*
 ** static prototypes
 */
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
 
 int autosw = 0;
 
@@ -127,7 +114,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
@@ -253,12 +240,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;
@@ -335,7 +316,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 +408,7 @@ do_cache:
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
 	if (i == SIGQUIT) {
@@ -457,7 +438,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 +924,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);