X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmshcmds.c;h=b8c7d9253dce5daa57ad38008e4ab62216b24828;hp=3d6e260fe70ae33f081079dbcb1e54d585fbd3d6;hb=8f4c5da8971926f7eccc912f7998c343aef3c33b;hpb=045b9601403a216c400642229f2b291f85f88f7d

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index 3d6e260..b8c7d92 100644
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -10,8 +10,8 @@
 #include <h/dropsbr.h>
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
-#include <zotnet/tws/tws.h>
-#include <zotnet/mts/mts.h>
+#include <h/tws.h>
+#include <mts/generic/mts.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
@@ -68,6 +68,8 @@ static int process (int, char *, int, char **);
 static void copy_message (int, FILE *);
 static void copy_digest (int, FILE *);
 
+/* from mhlsbr.c */
+int mhlsbr (int, char **, FILE *(*)());
 
 void
 forkcmd (char **args, char *pgm)
@@ -137,7 +139,7 @@ static struct swit distswit[] = {
 #define	DINWTSW                  11
     { "nowhatnowproc", 0 },
 #define	DIHELP                   12
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -238,7 +240,7 @@ static struct swit explswit[] = {
 #define	EXNVBSW        5
     { "noverbose", 0 },
 #define	EXHELP	       6
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -467,7 +469,7 @@ static struct swit fileswit[] = {
 #define	FINPRC               8
     { "normmproc", 0 },
 #define	FIHELP               9
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -631,7 +633,7 @@ static struct swit foldswit[] = {
 #define	FLLISW        14
     { "list", 0 },
 #define	FLHELP        15
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -850,7 +852,7 @@ static struct swit forwswit[] = {
 #define	FONWTSW                 16
     { "nowhatnow", 0 },
 #define	FOHELP                  17
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -1118,7 +1120,7 @@ static struct swit markswit[] = {
 #define	MNZERSW            7
     { "nozero", 0 },
 #define	MHELP              8
-    { "help", 4 },
+    { "help", 0 },
 #define	MDBUGSW            9
     { "debug", -5 },
     { NULL, 0 }
@@ -1337,7 +1339,7 @@ static struct swit mhnswit[] = {
 #define	MHNNVERBSW	   23
     { "noverbose", 0 },
 #define	MHNHELPSW	   24
-    { "help", 4 },
+    { "help", 0 },
 #define	MHNPROGSW	   25
     { "moreproc program", -4 },
 #define	MHNNPROGSW	   26
@@ -1452,11 +1454,11 @@ static struct swit packswit[] = {
 #define	PAFISW         0
     { "file name", 0 },
 #define	PAHELP         1
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
-static mbx_style = MMDF_FORMAT;
+static int mbx_style = MMDF_FORMAT;
 
 void
 packcmd (char **args)
@@ -1630,7 +1632,7 @@ static struct swit pickswit[] = {
 #define	PINLISW              21
     { "nolist", 0 },
 #define	PIHELP               22
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -1817,7 +1819,7 @@ static struct swit replswit[] = {
 #define	REWIDSW                19
     { "width columns", 0 },
 #define	REHELP                 20
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -1913,7 +1915,7 @@ replcmd (char **args)
 
 static struct swit rmmswit[] = {
 #define	RMHELP    0
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -2042,7 +2044,7 @@ static struct swit scanswit[] = {
 #define	SCWID              6
     { "width columns", 0 },
 #define	SCHELP             7
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -2292,7 +2294,7 @@ static struct swit showswit[] = {
 #define SHNHEAD               9
     { "noheader", 3 },
 #define	SHHELP               10
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -2385,7 +2387,6 @@ showcmd (char **args)
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
 	    if (is_selected (mp, msgnum) && is_nontext (msgnum)) {
 		proc = showmimeproc;
-		vec[vecp++] = "-show";
 		vec[vecp++] = "-file";
 		vec[vecp] = NULL;
 		goto finish;
@@ -2724,7 +2725,7 @@ static struct swit sortswit[] = {
 #define	SONVERB              6
     { "noverbose", 0 },
 #define	SOHELP               7
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };