X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhtest.c;h=a1718db77e082691d8857d63c457cd0ecc155a23;hb=2823e13f67239db7deb7274f3a47bfbff56c7c64;hp=c7afd66deb6f5c92151e3cb78ca533755b97f61f;hpb=31dc797eb5178970d68962ca8939da3fd9a8efda;p=mmh

diff --git a/uip/mhtest.c b/uip/mhtest.c
index c7afd66..a1718db 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -14,14 +14,13 @@
 #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 VERBSW  0
 	{ "verbose", 0 },
 #define NVERBSW  1
-	{ "noverbose", 0 },
+	{ "noverbose", 2 },
 #define FILESW  2
 	{ "file file", 0 },
 #define OUTFILESW  3
@@ -30,31 +29,19 @@ static struct swit switches[] = {
 	{ "part number", 0 },
 #define TYPESW  5
 	{ "type content", 0 },
-#define RCACHESW  6
-	{ "rcache policy", 0 },
-#define WCACHESW  7
-	{ "wcache policy", 0 },
-#define VERSIONSW  8
-	{ "version", 0 },
-#define HELPSW  9
+#define VERSIONSW  6
+	{ "Version", 0 },
+#define HELPSW  7
 	{ "help", 0 },
-#define DEBUGSW  10
+#define DEBUGSW  8
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
 
 
-int ebcdicsw = 0;  /* hack for linking purposes */
-
 /* 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;
@@ -88,7 +75,7 @@ void flush_errors(void);
 /* mhfree.c */
 void free_content(CT);
 extern CT *cts;
-void freects_done(int) NORETURN;
+void freects_done();
 
 /*
 ** static prototypes
@@ -100,7 +87,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], *outfile = NULL;
 	char **argp, **arguments;
@@ -108,11 +95,9 @@ main(int argc, char **argv)
 	struct msgs *mp = NULL;
 	CT ct, *ctp;
 
-	done=freects_done;
+	atexit(freects_done);
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -129,37 +114,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				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;
+				exit(0);
 
 			case PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
@@ -221,15 +186,6 @@ do_cache:
 	if (outfile == NULL)
 		adios(NULL, "must specify output file");
 
-	/* 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
@@ -277,7 +233,7 @@ do_cache:
 		/* parse all the message ranges/sequences and set SELECTED */
 		for (msgnum = 0; msgnum < msgs.size; msgnum++)
 			if (!m_convert(mp, msgs.msgs[msgnum]))
-				done(1);
+				exit(1);
 		seq_setprev(mp);  /* set the previous-sequence */
 
 		if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
@@ -297,7 +253,7 @@ do_cache:
 	}
 
 	if (!*cts)
-		done(1);
+		exit(1);
 
 	userrs = 1;
 	SIGNAL(SIGQUIT, quitser);
@@ -338,8 +294,7 @@ do_cache:
 		context_save();  /* save the context file  */
 	}
 
-	done(0);
-	return 1;
+	return 0;
 }
 
 
@@ -368,6 +323,6 @@ pipeser(int i)
 		fflush(stderr);
 	}
 
-	done(1);
+	exit(1);
 	/* NOTREACHED */
 }