Added missing NULL sentinels in switches array.

[mmh] / uip / mhlist.c

diff --git a/uip/mhlist.c b/uip/mhlist.c
index b87e522..45f3e9d 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.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 },
@@ -54,10 +49,6 @@ static struct swit switches[] = {
        { "version", 0 },
 #define HELPSW  14
        { "help", 0 },
-
-/*
-** switches for debugging
-*/
 #define DEBUGSW  15
        { "debug", -5 },
        { NULL, 0 }
@@ -111,7 +102,7 @@ void freects_done(int) NORETURN;
 /*
 ** static prototypes
 */
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
 
 
 int
@@ -280,14 +271,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);
@@ -361,7 +352,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  */
@@ -372,7 +363,7 @@ do_cache:
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
        if (i == SIGQUIT) {