X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhtest.c;h=a19475bd651f1967493c5f6a690efd1991914a3c;hp=17ca1ab78b5e330e4dcfb1c71d6254ed22fe632b;hb=d1fefd9f614e4dc3cda16da6c69133c1b2005269;hpb=240013872c392fe644bd4f79382d9f5314b4ea60

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 17ca1ab..a19475b 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -9,50 +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/mts.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 VERBSW  2
+#define VERBSW  0
 	{ "verbose", 0 },
-#define NVERBSW  3
+#define NVERBSW  1
 	{ "noverbose", 0 },
-#define FILESW  4
+#define FILESW  2
 	{ "file file", 0 },
-#define OUTFILESW  5
+#define OUTFILESW  3
 	{ "outfile file", 0 },
-#define PARTSW  6
+#define PARTSW  4
 	{ "part number", 0 },
-#define TYPESW  7
+#define TYPESW  5
 	{ "type content", 0 },
-#define RCACHESW  8
-	{ "rcache policy", 0 },
-#define WCACHESW  9
-	{ "wcache policy", 0 },
-#define VERSIONSW  10
+#define VERSIONSW  6
 	{ "version", 0 },
-#define HELPSW  11
+#define HELPSW  7
 	{ "help", 0 },
-
-/*
-** switches for debugging
-*/
-#define DEBUGSW  12
+#define DEBUGSW  8
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -63,12 +44,6 @@ 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;
@@ -108,13 +83,13 @@ void freects_done(int) NORETURN;
 ** static prototypes
 */
 static int write_content(CT *, char *);
-static RETSIGTYPE pipeser(int);
+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;
@@ -155,33 +130,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 PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s", argp[-2]);
@@ -203,14 +151,14 @@ do_cache:
 				if (!(cp = *argp++) || (*cp == '-' && cp[1]))
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				file = *cp == '-' ? cp : path(cp, TFILE);
+				file = *cp == '-' ? cp : getcpy(expanddir(cp));
 				continue;
 
 			case OUTFILESW:
 				if (!(cp = *argp++) || (*cp == '-' && cp[1]))
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				outfile = *cp == '-' ? cp : path(cp, TFILE);
+				outfile = *cp == '-' ? cp : getcpy(expanddir(cp));
 				continue;
 
 			case VERBSW:
@@ -228,7 +176,7 @@ do_cache:
 			if (folder)
 				adios(NULL, "only one folder at a time!");
 			else
-				folder = pluspath(cp);
+				folder = getcpy(expandfol(cp));
 		} else
 			app_msgarg(&msgs, cp);
 	}
@@ -242,15 +190,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(m_maildir(cache_private));
-
 	/*
 	** Check for storage directory.  If specified,
 	** then store temporary files there.  Else we
@@ -259,10 +198,7 @@ do_cache:
 	if ((cp = context_find(nmhstorage)) && *cp)
 		tmp = concat(cp, "/", invo_name, NULL);
 	else
-		tmp = add(m_maildir(invo_name), NULL);
-
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
+		tmp = getcpy(toabsdir(invo_name));
 
 	if (file && msgs.size)
 		adios(NULL, "cannot specify msg and file at same time!");
@@ -275,17 +211,17 @@ do_cache:
 			adios(NULL, "out of memory");
 		ctp = cts;
 
-		if ((ct = parse_mime(file)));
+		if ((ct = parse_mime(file)))
 			*ctp++ = ct;
 	} else {
 		/*
 		** message(s) are coming from a folder
 		*/
 		if (!msgs.size)
-			app_msgarg(&msgs, "cur");
+			app_msgarg(&msgs, seq_cur);
 		if (!folder)
-			folder = getfolder(1);
-		maildir = m_maildir(folder);
+			folder = getcurfol();
+		maildir = toabsdir(folder);
 
 		if (chdir(maildir) == NOTOK)
 			adios(maildir, "unable to change directory to");
@@ -356,7 +292,7 @@ do_cache:
 
 	/* If reading from a folder, do some updating */
 	if (mp) {
-		context_replace(pfolder, folder);  /* update current folder */
+		context_replace(curfolder, folder); /* update current folder */
 		seq_setcur(mp, mp->hghsel);  /* update current message */
 		seq_save(mp);  /* synchronize sequences  */
 		context_save();  /* save the context file  */
@@ -382,7 +318,7 @@ write_content(CT *cts, char *outfile)
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
 	if (i == SIGQUIT) {