Lots of little code cleanups to prevent warnings - mostly making sure

[mmh] / uip / mshcmds.c

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index a665536..13ad356 100644 (file)
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -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)
@@ -691,7 +693,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 +701,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");
@@ -932,11 +935,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)
@@ -1192,7 +1200,7 @@ markcmd (char **args)
        }
     }
 
-    if (!addsw && !deletesw && !listsw)
+    if (!addsw && !deletesw && !listsw) {
        if (seqp)
            addsw++;
        else
@@ -1205,6 +1213,7 @@ markcmd (char **args)
                if (!msgp)
                    msgs[msgp++] = "all";
            }
+    }
 
     if (!msgp)
        msgs[msgp++] = listsw ? "all" :"cur";
@@ -1449,7 +1458,7 @@ static struct swit packswit[] = {
     { NULL, 0 }
 };
 
-static mbx_style = MMDF_FORMAT;
+static int mbx_style = MMDF_FORMAT;
 
 void
 packcmd (char **args)