X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/de4636bb664106d9932ae7acb517e471b848f1f3..bf58e45a34dcf8300098abff38c4e7393152f365:/uip/mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 61a54e63..fb5349fa 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.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>
@@ -28,6 +26,7 @@
     X("verbose", 0, VERBSW) \
     X("noverbose", 0, NVERBSW) \
     X("file file", 0, FILESW)		/* interface from show */ \
+    X("outfile outfile", 0, OUTFILESW) \
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
     X("rcache policy", 0, RCACHESW) \
@@ -49,9 +48,6 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches);
 int save_clobber_policy (const char *);
 extern int files_not_clobbered;
 
-/* mhparse.c */
-extern char *tmp;	/* directory to place temp files */
-
 /* mhcachesbr.c */
 extern int rcachesw;
 extern int wcachesw;
@@ -86,7 +82,6 @@ void flush_errors (void);
 void store_all_messages (CT *);
 
 /* mhfree.c */
-void free_content (CT);
 extern CT *cts;
 void freects_done (int) NORETURN;
 
@@ -100,7 +95,7 @@ int
 main (int argc, char **argv)
 {
     int msgnum, *icachesw;
-    char *cp, *file = NULL, *folder = NULL;
+    char *cp, *file = NULL, *outfile = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;
     char **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
@@ -108,15 +103,9 @@ main (int argc, char **argv)
     CT ct, *ctp;
     FILE *fp;
 
-    done=freects_done;
-
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], 1)) { return 1; }
 
-    /* read user profile/context */
-    context_read();
+    done=freects_done;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -199,6 +188,12 @@ do_cache:
 		file = *cp == '-' ? cp : path (cp, TFILE);
 		continue;
 
+	    case OUTFILESW:
+		if (!(cp = *argp++) || (*cp == '-' && cp[1]))
+		    adios (NULL, "missing argument to %s", argp[-2]);
+		outfile = *cp == '-' ? cp : path (cp, TFILE);
+		continue;
+
 	    case VERBSW: 
 		verbosw = 1;
 		continue;
@@ -265,16 +260,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));
 
@@ -289,8 +274,12 @@ do_cache:
 	    adios (NULL, "out of memory");
 	ctp = cts;
 
-	if ((ct = parse_mime (file)))
+	if ((ct = parse_mime (file))) {
 	    *ctp++ = ct;
+	    if (outfile) {
+		ct->c_storage = outfile;
+	    }
+        }
     } else {
 	/*
 	 * message(s) are coming from a folder
@@ -305,7 +294,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 */
@@ -327,8 +316,12 @@ do_cache:
 		char *msgnam;
 
 		msgnam = m_name (msgnum);
-		if ((ct = parse_mime (msgnam)))
+		if ((ct = parse_mime (msgnam))) {
 		    *ctp++ = ct;
+		    if (outfile) {
+			ct->c_storage = add (outfile, NULL);
+		    }
+                }
 	    }
 	}
     }
@@ -384,7 +377,6 @@ static void
 pipeser (int i)
 {
     if (i == SIGQUIT) {
-	unlink ("core");
 	fflush (stdout);
 	fprintf (stderr, "\n");
 	fflush (stderr);