X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshow.c;h=bf5ef8bbe20f481f80ef6782527feb0a5f000109;hb=2d48b455c303a807041c35e4248955f8bec59eeb;hp=a090e2e08d64a7ea40ddb4489c6bc69af5f5067a;hpb=a7771fd2e83d64228fb675749fc936151249dbd3;p=mmh

diff --git a/uip/mhshow.c b/uip/mhshow.c
index a090e2e..bf5ef8b 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -12,7 +12,6 @@
 #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>
@@ -28,33 +27,29 @@ static struct swit switches[] = {
 	{ "check", 0 },
 #define NCHECKSW  1
 	{ "nocheck", 0 },
-#define PAUSESW  2
-	{ "pause", 0 },
-#define NPAUSESW  3
-	{ "nopause", 0 },
-#define SERIALSW  4
+#define SERIALSW  2
 	{ "serialonly", 0 },
-#define NSERIALSW  5
+#define NSERIALSW  3
 	{ "noserialonly", 0 },
-#define VERBSW  6
+#define VERBSW  4
 	{ "verbose", 0 },
-#define NVERBSW  7
+#define NVERBSW  5
 	{ "noverbose", 0 },
-#define FILESW  8  /* interface from show */
+#define FILESW  6  /* interface from show */
 	{ "file file", 0 },
-#define FORMSW  9
+#define FORMSW  7
 	{ "form formfile", 0 },
-#define PARTSW  10
+#define PARTSW  8
 	{ "part number", 0 },
-#define TYPESW  11
+#define TYPESW  9
 	{ "type content", 0 },
-#define RCACHESW  12
+#define RCACHESW  10
 	{ "rcache policy", 0 },
-#define WCACHESW  13
+#define WCACHESW  11
 	{ "wcache policy", 0 },
-#define VERSIONSW  14
+#define VERSIONSW  12
 	{ "version", 0 },
-#define HELPSW  15
+#define HELPSW  13
 	{ "help", 0 },
 
 /*
@@ -88,7 +83,6 @@ extern char *cache_public;
 extern char *cache_private;
 
 /* mhshowsbr.c */
-extern int pausesw;
 extern int serialsw;
 extern char *progsw;
 extern int nolist;
@@ -202,13 +196,6 @@ do_cache:
 				checksw = 0;
 				continue;
 
-			case PAUSESW:
-				pausesw = 1;
-				continue;
-			case NPAUSESW:
-				pausesw = 0;
-				continue;
-
 			case SERIALSW:
 				serialsw = 1;
 				continue;
@@ -295,9 +282,8 @@ do_cache:
 
 	set_endian();
 
-	if ((cp = getenv("MM_NOASK")) && !strcmp(cp, "1")) {
+	if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0) {
 		nolist  = 1;
-		pausesw = 0;
 	}
 
 	/*
@@ -358,7 +344,7 @@ do_cache:
 		** 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);