Fixed file descriptor leak in mhfixmsg when run on multiple input files.

[nmh] / uip / mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 628d059ff30d055c39da79010dd5a66610887f8a..11edb39815e9d95632f33533de18fd211af55260 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,18 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"
@@ -15,12 +27,10 @@
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/signals.h"
-#include "h/md5.h"
 #include "h/mts.h"
 #include "h/tws.h"
 #include "h/mime.h"
 #include "h/mhparse.h"
-#include "h/mhcachesbr.h"
 #include "h/done.h"
 #include "h/utils.h"
 #include "mhmisc.h"
@@ -30,8 +40,8 @@
 #define MHSTORE_SWITCHES \
     X("auto", 0, AUTOSW) \
     X("noauto", 0, NAUTOSW) \
-    X("check", 0, CHECKSW) \
-    X("nocheck", 0, NCHECKSW) \
+    X("check", -5, CHECKSW) \
+    X("nocheck", -7, NCHECKSW) \
     X("verbose", 0, VERBSW) \
     X("noverbose", 0, NVERBSW) \
     X("file file", 0, FILESW)          /* interface from show */ \
@@ -40,8 +50,6 @@
     X("type content", 0, TYPESW) \
     X("prefer content", 0, PREFERSW) \
     X("noprefer", 0, NPREFERSW) \
-    X("rcache policy", 0, RCACHESW) \
-    X("wcache policy", 0, WCACHESW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("clobber always|auto|suffix|ask|never", 0, CLOBBERSW) \
@@ -70,7 +78,7 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
-    int msgnum, *icachesw;
+    int msgnum;
     bool autosw = false;
     /* verbosw defaults to 1 for backward compatibility. */
     bool verbosw = true;
@@ -121,30 +129,9 @@ main (int argc, char **argv)
                autosw = false;
                continue;
 
-           case RCACHESW:
-               icachesw = &rcachesw;
-               goto do_cache;
-           case WCACHESW:
-               icachesw = &wcachesw;
-do_cache:
-               if (!(cp = *argp++) || *cp == '-')
-                   die("missing argument to %s", argp[-2]);
-               switch (*icachesw = smatch (cp, cache_policy)) {
-               case AMBIGSW:
-                   ambigsw (cp, cache_policy);
-                   done (1);
-               case UNKWNSW:
-                   die("%s unknown", cp);
-               default:
-                   break;
-               }
-               continue;
-
            case CHECKSW:
-               checksw++;
-               continue;
            case NCHECKSW:
-               checksw = 0;
+               /* Currently a NOP */
                continue;
 
            case PARTSW:
@@ -241,15 +228,6 @@ do_cache:
        fclose (fp);
     }
 
-    /* Check for public cache location */
-    if ((cache_public = context_find (nmhcache)) && *cache_public != '/')
-       cache_public = NULL;
-
-    /* Check for private cache location */
-    if (!(cache_private = context_find (nmhprivcache)))
-       cache_private = ".cache";
-    cache_private = mh_xstrdup(m_maildir(cache_private));
-
     /*
      * Cache the current directory before we do any chdirs()'s.
      */