X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhtest.c;h=164d3905442b53c3dd94710ba46d6d75f7b94ca6;hb=3d6f5c837570d47d61e12df7e98ebec25ad08d46;hp=df5985fac4ab45682f0d285cbf849928043acbd2;hpb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;p=mmh

diff --git a/uip/mhtest.c b/uip/mhtest.c
index df5985f..164d390 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -12,17 +12,12 @@
 #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 },
@@ -48,10 +43,6 @@ static struct swit switches[] = {
 	{ "version", 0 },
 #define HELPSW  11
 	{ "help", 0 },
-
-/*
-** switches for debugging
-*/
 #define DEBUGSW  12
 	{ "debug", -5 },
 	{ NULL, 0 }
@@ -108,7 +99,7 @@ void freects_done(int) NORETURN;
 ** static prototypes
 */
 static int write_content(CT *, char *);
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
 
 
 int
@@ -272,14 +263,14 @@ 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 = getcurfol();
 		maildir = toabsdir(folder);
@@ -353,7 +344,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  */
@@ -379,7 +370,7 @@ write_content(CT *cts, char *outfile)
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
 	if (i == SIGQUIT) {