Disable assertions by default.

[nmh] / uip / mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 69c066d17f25e0e602d046f089be08ad29fea8f2..79f335e55b81e95911139c71b3d1b95205ea412d 100644 (file)
--- 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) \
@@ -86,7 +85,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 +98,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 };
@@ -199,6 +197,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;
@@ -289,8 +293,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 +313,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 +335,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);
+                   }
+                }
            }
        }
     }