Replaced use of mkstemp() with m_mktemp2() in header_fd() of

[nmh] / uip / mhn.c

diff --git a/uip/mhn.c b/uip/mhn.c
index 217373992a9b5e2b265160a40512915fe74d60bd..49c784b9f19761bb5a589ce4c865db8bfb6e18d1 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -11,8 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
@@ -79,9 +77,6 @@ DEFINE_SWITCH_ARRAY(MHN, switches);
 #undef X
 
 
-/* mhparse.c */
-extern char *tmp;      /* directory to place temp files */
-
 /* mhcachesbr.c */
 extern int rcachesw;
 extern int wcachesw;
@@ -147,7 +142,6 @@ void store_all_messages (CT *);
 void cache_all_messages (CT *);
 
 /* mhfree.c */
-void free_content (CT);
 extern CT *cts;
 void freects_done (int) NORETURN;
 
@@ -416,16 +410,6 @@ do_cache:
      */
     cwd = getcpy (pwd());
 
-    /*
-     * Check for storage directory.  If specified,
-     * then store temporary files there.  Else we
-     * store them in standard nmh directory.
-     */
-    if ((cp = context_find (nmhstorage)) && *cp)
-       tmp = concat (cp, "/", invo_name, NULL);
-    else
-       tmp = add (m_maildir (invo_name), NULL);
-
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
@@ -513,7 +497,7 @@ do_cache:
            adios (maildir, "unable to change directory to");
 
        /* read folder and create message structure */
-       if (!(mp = folder_read (folder)))
+       if (!(mp = folder_read (folder, 1)))
            adios (NULL, "unable to read folder %s", folder);
 
        /* check for empty folder */