[bug #4302] errno is not always an extern int

[mmh] / uip / mshcmds.c

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index a665536..4566029 100644 (file)
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -3,6 +3,10 @@
  * mshcmds.c -- command handlers in msh
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
@@ -10,15 +14,14 @@
 #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 <h/mts.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <h/msh.h>
 #include <h/picksbr.h>
 
-extern int errno;
 
 static char delim3[] = "-------";      /* from burst.c */
 
@@ -68,6 +71,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 +142,7 @@ static struct swit distswit[] = {
 #define        DINWTSW                  11
     { "nowhatnowproc", 0 },
 #define        DIHELP                   12
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -238,7 +243,7 @@ static struct swit explswit[] = {
 #define        EXNVBSW        5
     { "noverbose", 0 },
 #define        EXHELP         6
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -467,7 +472,7 @@ static struct swit fileswit[] = {
 #define        FINPRC               8
     { "normmproc", 0 },
 #define        FIHELP               9
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -631,7 +636,7 @@ static struct swit foldswit[] = {
 #define        FLLISW        14
     { "list", 0 },
 #define        FLHELP        15
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -691,7 +696,7 @@ foldcmd (char **args)
                    packsw = 0;
                    continue;
            }
-       if (*cp == '+' || *cp == '@')
+       if (*cp == '+' || *cp == '@') {
            if (folder) {
                advise (NULL, "only one folder at a time!\n");
                return;
@@ -699,6 +704,7 @@ foldcmd (char **args)
            else
                folder = fmsh ? path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF)
                            : cp + 1;
+       }
        else
            if (msg) {
                advise (NULL, "only one message at a time!\n");
@@ -849,7 +855,7 @@ static struct swit forwswit[] = {
 #define        FONWTSW                 16
     { "nowhatnow", 0 },
 #define        FOHELP                  17
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -932,11 +938,16 @@ forwcmd (char **args)
 
                                        /* foil search of .mh_profile */
     snprintf (buf, sizeof(buf), "%sXXXXXX", invo_name);
+/*
+  Mkstemp work postponed until later -Doug
 #ifdef HAVE_MKSTEMP
     vec[0] = (char *)mkstemp (buf);
 #else
+*/
     vec[0] = (char *)mktemp (buf);
+/*
 #endif
+*/
     vec[vecp++] = "-file";
     vec[vecp] = NULL;
     if (!msgp)
@@ -1112,7 +1123,7 @@ static struct swit markswit[] = {
 #define        MNZERSW            7
     { "nozero", 0 },
 #define        MHELP              8
-    { "help", 4 },
+    { "help", 0 },
 #define        MDBUGSW            9
     { "debug", -5 },
     { NULL, 0 }
@@ -1192,7 +1203,7 @@ markcmd (char **args)
        }
     }
 
-    if (!addsw && !deletesw && !listsw)
+    if (!addsw && !deletesw && !listsw) {
        if (seqp)
            addsw++;
        else
@@ -1205,6 +1216,7 @@ markcmd (char **args)
                if (!msgp)
                    msgs[msgp++] = "all";
            }
+    }
 
     if (!msgp)
        msgs[msgp++] = listsw ? "all" :"cur";
@@ -1330,7 +1342,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
@@ -1445,11 +1457,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)
@@ -1623,7 +1635,7 @@ static struct swit pickswit[] = {
 #define        PINLISW              21
     { "nolist", 0 },
 #define        PIHELP               22
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -1810,7 +1822,7 @@ static struct swit replswit[] = {
 #define        REWIDSW                19
     { "width columns", 0 },
 #define        REHELP                 20
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -1906,7 +1918,7 @@ replcmd (char **args)
 
 static struct swit rmmswit[] = {
 #define        RMHELP    0
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -2035,7 +2047,7 @@ static struct swit scanswit[] = {
 #define        SCWID              6
     { "width columns", 0 },
 #define        SCHELP             7
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -2285,7 +2297,7 @@ static struct swit showswit[] = {
 #define SHNHEAD               9
     { "noheader", 3 },
 #define        SHHELP               10
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -2378,7 +2390,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;
@@ -2717,7 +2728,7 @@ static struct swit sortswit[] = {
 #define        SONVERB              6
     { "noverbose", 0 },
 #define        SOHELP               7
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -2997,7 +3008,6 @@ process (int msgnum, char *proc, int vecp, char **vec)
     strncpy (tmpfil, m_scratch ("", invo_name), sizeof(tmpfil));
     if ((out = fopen (tmpfil, "w")) == NULL) {
        int olderr;
-       extern int errno;
        char newfil[80];
 
        olderr = errno;