lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 14d7cde938c387e43202f88e99d8bf7c4a3007fb..ed6ad77fddcec97d3de0971c0e43ca57aeb6cbb0 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -1,173 +1,108 @@
-
-/*
- * mhstore.c -- store the contents of MIME messages
+/* mhstore.c -- store the contents of MIME messages

  *
  *

- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.

  */
 
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
  */
 
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>

-#include <errno.h>
-#include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>

+#include <h/utils.h>
+#include "mhmisc.h"
+#include "sbr/m_maildir.h"
+#include "mhfree.h"
+
+#define MHSTORE_SWITCHES \
+    X("auto", 0, AUTOSW) \
+    X("noauto", 0, NAUTOSW) \
+    X("check", 0, CHECKSW) \
+    X("nocheck", 0, NCHECKSW) \
+    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("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) \
+    X("debug", -5, DEBUGSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(MHSTORE);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MHSTORE, switches);
+#undef X

 
 

-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-/*
- * We allocate space for message names (msgs array)
- * this number of elements at a time.
- */
-#define MAXMSGS  256
-
-
-static struct swit switches[] = {
-#define        AUTOSW                  0
-    { "auto", 0 },
-#define        NAUTOSW                 1
-    { "noauto", 0 },
-#define        CHECKSW                 2
-    { "check", 0 },
-#define        NCHECKSW                3
-    { "nocheck", 0 },
-#define        VERBSW                  4
-    { "verbose", 0 },
-#define        NVERBSW                 5
-    { "noverbose", 0 },
-#define        FILESW                  6       /* interface from show */
-    { "file file", 0 },
-#define        PARTSW                  7
-    { "part number", 0 },
-#define        TYPESW                  8
-    { "type content", 0 },
-#define        RCACHESW                9
-    { "rcache policy", 0 },
-#define        WCACHESW               10
-    { "wcache policy", 0 },
-#define VERSIONSW              11
-    { "version", 0 },
-#define        HELPSW                 12
-    { "help", 0 },
-
-/*
- * switches for debugging
- */
-#define        DEBUGSW                13
-    { "debug", -5 },
-    { NULL, 0 }
-};
-
-
-extern int errno;
-
-/* mhparse.c */
-extern int checksw;
-extern char *tmp;      /* directory to place temp files */
-
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
-/* mhstoresbr.c */
-extern int autosw;
-extern char *cwd;      /* cache current working directory */
-
-/* mhmisc.c */
-extern int npart;
-extern int ntype;
-extern char *parts[NPARTS + 1];
-extern char *types[NTYPES + 1];
-extern int userrs;
-
-int debugsw = 0;
-int verbosw = 0;
-
-/* The list of top-level contents to display */
-CT *cts = NULL;

 
 #define        quitser pipeser
 
 /* mhparse.c */
 
 #define        quitser pipeser
 
 /* mhparse.c */

-CT parse_mime (char *);
-
-/* mhmisc.c */
-int part_ok (CT, int);
-int type_ok (CT, int);
-void set_endian (void);
-void flush_errors (void);
-
-/* mhstoresbr.c */
-void store_all_messages (CT *);
-
-/* mhfree.c */
-void free_content (CT);
+int debugsw = 0;

 
 /*
  * static prototypes
  */
 
 /*
  * static prototypes
  */

-static RETSIGTYPE pipeser (int);
+static void pipeser (int);

 
 
 int
 main (int argc, char **argv)
 {
 
 
 int
 main (int argc, char **argv)
 {

-    int nummsgs, maxmsgs, msgnum, *icachesw;
-    char *cp, *file = NULL, *folder = NULL;
+    /* verbosw defaults to 1 for backward compatibility. */
+    int msgnum, *icachesw, autosw = 0, verbosw = 1;
+    const char *clobbersw = "always";
+    char *cp, *file = NULL, *outfile = NULL, *folder = NULL;

     char *maildir, buf[100], **argp;
     char *maildir, buf[100], **argp;

-    char **arguments, **msgs;
+    char **arguments;
+    char *cwd;
+    struct msgs_array msgs = { 0, 0, NULL };

     struct msgs *mp = NULL;
     CT ct, *ctp;
     FILE *fp;
     struct msgs *mp = NULL;
     CT ct, *ctp;
     FILE *fp;

+    int files_not_clobbered;
+    mhstoreinfo_t info;

 
 

-#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;
 
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 

-    /*
-     * Allocate the initial space to record message
-     * names, ranges, and sequences.
-     */
-    nummsgs = 0;
-    maxmsgs = MAXMSGS;
-    if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs)))))
-       adios (NULL, "unable to allocate storage");
-

     /*
      * Parse arguments
      */
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     /*
      * Parse arguments
      */
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {

-           case AMBIGSW: 
+           case AMBIGSW:

                ambigsw (cp, switches);
                done (1);
                ambigsw (cp, switches);
                done (1);

-           case UNKWNSW: 
+           case UNKWNSW:

                adios (NULL, "-%s unknown", cp);
 
                adios (NULL, "-%s unknown", cp);
 

-           case HELPSW: 
+           case HELPSW:

                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                print_help (buf, switches, 1);
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                print_help (buf, switches, 1);

-               done (1);
+               done (0);

            case VERSIONSW:
                print_version(invo_name);
            case VERSIONSW:
                print_version(invo_name);

-               done (1);
+               done (0);

 
            case AUTOSW:
                autosw++;
 
            case AUTOSW:
                autosw++;


@@ -184,9 +119,9 @@ main (int argc, char **argv)
 do_cache:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
 do_cache:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);

-               switch (*icachesw = smatch (cp, caches)) {
+               switch (*icachesw = smatch (cp, cache_policy)) {

                case AMBIGSW:
                case AMBIGSW:

-                   ambigsw (cp, caches);
+                   ambigsw (cp, cache_policy);

                    done (1);
                case UNKWNSW:
                    adios (NULL, "%s unknown", cp);
                    done (1);
                case UNKWNSW:
                    adios (NULL, "%s unknown", cp);


@@ -220,18 +155,45 @@ do_cache:
                types[ntype++] = cp;
                continue;
 
                types[ntype++] = cp;
                continue;
 

+           case PREFERSW:
+               if (!(cp = *argp++) || *cp == '-')
+                   adios (NULL, "missing argument to %s", argp[-2]);
+               if (npreferred >= NPREFS)
+                   adios (NULL, "too many preferred types (starting with %s), %d max",
+                          cp, NPREFS);
+               mime_preference[npreferred].type = cp;
+               cp = strchr(cp, '/');
+               if (cp) *cp++ = '\0';
+               mime_preference[npreferred++].subtype = cp;
+               continue;
+
+           case NPREFERSW:
+               npreferred = 0;
+               continue;
+

            case FILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                    adios (NULL, "missing argument to %s", argp[-2]);
                file = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 
            case FILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                    adios (NULL, "missing argument to %s", argp[-2]);
                file = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 

-           case VERBSW: 
+           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;
                verbosw = 1;
                continue;

-           case NVERBSW: 
+           case NVERBSW:

                verbosw = 0;
                continue;
                verbosw = 0;
                continue;

+            case CLOBBERSW:
+               if (!(cp = *argp++) || *cp == '-')
+                   adios (NULL, "missing argument to %s", argp[-2]);
+               clobbersw = cp;
+               continue;

            case DEBUGSW:
                debugsw = 1;
                continue;
            case DEBUGSW:
                debugsw = 1;
                continue;


@@ -240,35 +202,21 @@ do_cache:
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");

-           else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
-       } else {
-           /*
-            * Check if we need to allocate more space
-            * for message names/ranges/sequences.
-            */
-           if (nummsgs >= maxmsgs) {
-               maxmsgs += MAXMSGS;
-               if (!(msgs = (char **) realloc (msgs,
-                       (size_t) (maxmsgs * sizeof(*msgs)))))
-                   adios (NULL, "unable to reallocate msgs storage");
-           }
-           msgs[nummsgs++] = cp;
-       }
+            folder = pluspath (cp);
+       } else
+               app_msgarg(&msgs, cp);

     }
 
     /* null terminate the list of acceptable parts/types */
     parts[npart] = NULL;
     types[ntype] = NULL;
 
     }
 
     /* null terminate the list of acceptable parts/types */
     parts[npart] = NULL;
     types[ntype] = NULL;
 

-    set_endian ();
-

     /*
      * Check if we've specified an additional profile
      */
     if ((cp = getenv ("MHSTORE"))) {
        if ((fp = fopen (cp, "r"))) {
     /*
      * Check if we've specified an additional profile
      */
     if ((cp = getenv ("MHSTORE"))) {
        if ((fp = fopen (cp, "r"))) {

-           readconfig ((struct node **) 0, fp, cp, 0);
+           readconfig(NULL, fp, cp, 0);

            fclose (fp);
        } else {
            admonish ("", "unable to read $MHSTORE profile (%s)", cp);
            fclose (fp);
        } else {
            admonish ("", "unable to read $MHSTORE profile (%s)", cp);


@@ -279,7 +227,7 @@ do_cache:
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {

-       readconfig ((struct node **) 0, fp, cp, 0);
+       readconfig(NULL, fp, cp, 0);

        fclose (fp);
     }
 
        fclose (fp);
     }
 


@@ -295,40 +243,33 @@ do_cache:
     /*
      * Cache the current directory before we do any chdirs()'s.
      */
     /*
      * Cache the current directory before we do any chdirs()'s.
      */

-    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);
+    cwd = mh_xstrdup(pwd());

 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 

-    if (file && nummsgs)
+    if (file && msgs.size)

        adios (NULL, "cannot specify msg and file at same time!");
 
     /*
      * check if message is coming from file
      */
     if (file) {
        adios (NULL, "cannot specify msg and file at same time!");
 
     /*
      * check if message is coming from file
      */
     if (file) {

-       if (!(cts = (CT *) calloc ((size_t) 2, sizeof(*cts))))
-           adios (NULL, "out of memory");
+       cts = mh_xcalloc(2, sizeof *cts);

        ctp = cts;
 
        ctp = cts;
 

-       if ((ct = parse_mime (file)));
+       if ((ct = parse_mime (file))) {

            *ctp++ = ct;
            *ctp++ = ct;

+           if (outfile) {
+               ct->c_storage = mh_xstrdup(outfile);
+           }
+        }

     } else {
        /*
         * message(s) are coming from a folder
         */
     } else {
        /*
         * message(s) are coming from a folder
         */

-       if (!nummsgs)
-           msgs[nummsgs++] = "cur";
+       if (!msgs.size)
+           app_msgarg(&msgs, "cur");

        if (!folder)
            folder = getfolder (1);
        maildir = m_maildir (folder);
        if (!folder)
            folder = getfolder (1);
        maildir = m_maildir (folder);


@@ -337,7 +278,7 @@ do_cache:
            adios (maildir, "unable to change directory to");
 
        /* read folder and create message structure */
            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 */
            adios (NULL, "unable to read folder %s", folder);
 
        /* check for empty folder */


@@ -345,13 +286,12 @@ do_cache:
            adios (NULL, "no messages in %s", folder);
 
        /* parse all the message ranges/sequences and set SELECTED */
            adios (NULL, "no messages in %s", folder);
 
        /* parse all the message ranges/sequences and set SELECTED */

-       for (msgnum = 0; msgnum < nummsgs; msgnum++)
-           if (!m_convert (mp, msgs[msgnum]))
+       for (msgnum = 0; msgnum < msgs.size; msgnum++)
+           if (!m_convert (mp, msgs.msgs[msgnum]))

                done (1);
        seq_setprev (mp);       /* set the previous-sequence */
 
                done (1);
        seq_setprev (mp);       /* set the previous-sequence */
 

-       if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
-           adios (NULL, "out of memory");
+       cts = mh_xcalloc(mp->numsel + 1, sizeof *cts);

        ctp = cts;
 
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
        ctp = cts;
 
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {


@@ -359,8 +299,12 @@ do_cache:
                char *msgnam;
 
                msgnam = m_name (msgnum);
                char *msgnam;
 
                msgnam = m_name (msgnum);

-               if ((ct = parse_mime (msgnam)))
+               if ((ct = parse_mime (msgnam))) {

                    *ctp++ = ct;
                    *ctp++ = ct;

+                   if (outfile) {
+                       ct->c_storage = mh_xstrdup(outfile);
+                   }
+                }

            }
        }
     }
            }
        }
     }


@@ -390,13 +334,16 @@ do_cache:
     /*
      * Store the message content
      */
     /*
      * Store the message content
      */

-    store_all_messages (cts);
+    info = mhstoreinfo_create (cts, cwd, clobbersw, autosw, verbosw);
+    store_all_messages (info);
+    files_not_clobbered = mhstoreinfo_files_not_clobbered(info);
+    mhstoreinfo_free(info);

 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
        free_content (*ctp);
 
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
        free_content (*ctp);
 

-    free ((char *) cts);
+    free (cts);

     cts = NULL;
 
     /* If reading from a folder, do some updating */
     cts = NULL;
 
     /* If reading from a folder, do some updating */


@@ -407,15 +354,15 @@ do_cache:
        context_save ();                  /* save the context file  */
     }
 
        context_save ();                  /* save the context file  */
     }
 

-    return done (0);
+    done (files_not_clobbered);
+    return 1;

 }
 
 
 }
 
 

-static RETSIGTYPE
+static void

 pipeser (int i)
 {
     if (i == SIGQUIT) {
 pipeser (int i)
 {
     if (i == SIGQUIT) {

-       unlink ("core");

        fflush (stdout);
        fprintf (stderr, "\n");
        fflush (stderr);
        fflush (stdout);
        fprintf (stderr, "\n");
        fflush (stderr);


@@ -424,17 +371,3 @@ pipeser (int i)
     done (1);
     /* NOTREACHED */
 }
     done (1);
     /* NOTREACHED */
 }

-
-
-int
-done (int status)
-{
-    CT *ctp;
-
-    if ((ctp = cts))
-       for (; *ctp; ctp++)
-           free_content (*ctp);
-
-    exit (status);
-    return 1;  /* dead code to satisfy the compiler */
-}