X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhlist.c;h=7129ce5a973343ef092060916ccc5f0925c9dad6;hp=8902f7595f206e493c813b0cb08bd6e9da643e3a;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=33dc8211a72df0c27fa11220f3b27583cd1c7e49

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 8902f75..7129ce5 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -9,55 +9,29 @@
 #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>
 
-#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 HEADSW  2
-	{ "headers", 0 },
-#define NHEADSW  3
-	{ "noheaders", 0 },
-#define SIZESW  4
-	{ "realsize", 0 },
-#define NSIZESW  5
-	{ "norealsize", 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 PARTSW  9
+#define PARTSW  3
 	{ "part number", 0 },
-#define TYPESW  10
+#define TYPESW  4
 	{ "type content", 0 },
-#define RCACHESW  11
-	{ "rcache policy", 0 },
-#define WCACHESW  12
-	{ "wcache policy", 0 },
-#define VERSIONSW  13
-	{ "version", 0 },
-#define HELPSW  14
+#define VERSIONSW  5
+	{ "Version", 0 },
+#define HELPSW  6
 	{ "help", 0 },
-
-/*
-** switches for debugging
-*/
-#define DEBUGSW  15
+#define DEBUGSW  7
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -66,12 +40,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;
@@ -100,7 +68,7 @@ void set_endian(void);
 void flush_errors(void);
 
 /* mhlistsbr.c */
-void list_all_messages(CT *, int, int, int, int);
+void list_all_messages(CT *, int, int);
 
 /* mhfree.c */
 void free_content(CT);
@@ -110,14 +78,13 @@ void freects_done(int) NORETURN;
 /*
 ** static prototypes
 */
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
 
 
 int
 main(int argc, char **argv)
 {
-	int sizesw = 1, headsw = 1;
-	int msgnum, *icachesw;
+	int msgnum;
 	char *cp, *file = NULL, *folder = NULL;
 	char *maildir, buf[100], **argp;
 	char **arguments;
@@ -158,46 +125,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 HEADSW:
-				headsw = 1;
-				continue;
-			case NHEADSW:
-				headsw = 0;
-				continue;
-
-			case SIZESW:
-				sizesw = 1;
-				continue;
-			case NSIZESW:
-				sizesw = 0;
-				continue;
-
 			case PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
@@ -249,15 +176,6 @@ do_cache:
 
 	set_endian();
 
-	/* 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
@@ -279,7 +197,7 @@ do_cache:
 			adios(NULL, "out of memory");
 		ctp = cts;
 
-		if ((ct = parse_mime(file)));
+		if ((ct = parse_mime(file)))
 			*ctp++ = ct;
 	} else {
 		/*
@@ -349,7 +267,7 @@ do_cache:
 	/*
 	** List the message content
 	*/
-	list_all_messages(cts, headsw, sizesw, verbosw, debugsw);
+	list_all_messages(cts, verbosw, debugsw);
 
 	/* Now free all the structures for the content */
 	for (ctp = cts; *ctp; ctp++)
@@ -371,7 +289,7 @@ do_cache:
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
 	if (i == SIGQUIT) {