content_error(): Add missing va_end(3).

[nmh] / uip / mhstoresbr.c

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index ae835fbfdd1267e899a0cd96f18cbdbd271e7a51..46574a13a029021b8112f5eb85d36ea44e8a60ae 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -1,6 +1,4 @@
-
-/*
- * mhstoresbr.c -- routines to save/store the contents of MIME messages
+/* mhstoresbr.c -- routines to save/store the contents of MIME messages

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -9,13 +7,17 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
 
 #include <h/mh.h>
 #include <fcntl.h>

-#include <h/signals.h>

 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>

+#include <h/fmt_scan.h>

 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>

+#include "mhmisc.h"
+#include "mhshowsbr.h"
+#include "../sbr/m_maildir.h"
+#include "../sbr/m_mktemp.h"

 
 enum clobber_policy_t {
   NMH_CLOBBER_ALWAYS = 0,
 
 enum clobber_policy_t {
   NMH_CLOBBER_ALWAYS = 0,


@@ -25,7 +27,7 @@ enum clobber_policy_t {
   NMH_CLOBBER_NEVER
 };
 
   NMH_CLOBBER_NEVER
 };
 

-static enum clobber_policy_t clobber_policy (const char *);
+static enum clobber_policy_t clobber_policy (const char *) PURE;

 
 struct mhstoreinfo {
     CT *cts;                 /* Top-level list of contents to store. */
 
 struct mhstoreinfo {
     CT *cts;                 /* Top-level list of contents to store. */


@@ -41,10 +43,13 @@ struct mhstoreinfo {
     enum clobber_policy_t clobber_policy;  /* -clobber selection */
 };
 
     enum clobber_policy_t clobber_policy;  /* -clobber selection */
 };
 

+static bool use_param_as_filename(const char *p);
+

 mhstoreinfo_t
 mhstoreinfo_create (CT *ct, char *pwd, const char *csw, int asw, int vsw) {
 mhstoreinfo_t
 mhstoreinfo_create (CT *ct, char *pwd, const char *csw, int asw, int vsw) {

-    mhstoreinfo_t info = mh_xmalloc (sizeof *info);
+    mhstoreinfo_t info;

 
 

+    NEW(info);

     info->cts = ct;
     info->cwd = pwd;
     info->autosw = asw;
     info->cts = ct;
     info->cwd = pwd;
     info->autosw = asw;


@@ -76,11 +81,6 @@ mhstoreinfo_files_not_clobbered (const mhstoreinfo_t info) {
 typedef int (*qsort_comp) (const void *, const void *);
 
 
 typedef int (*qsort_comp) (const void *, const void *);
 
 

-/* mhmisc.c */
-int part_ok (CT, int);
-int type_ok (CT, int);
-void flush_errors (void);
-

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


@@ -116,7 +116,7 @@ store_all_messages (mhstoreinfo_t info)
      * store any contents.
      */
     if ((cp = context_find (nmhstorage)) && *cp)
      * store any contents.
      */
     if ((cp = context_find (nmhstorage)) && *cp)

-       info->dir = getcpy (cp);
+       info->dir = mh_xstrdup(cp);

     else
        info->dir = getcpy (info->cwd);
 
     else
        info->dir = getcpy (info->cwd);
 


@@ -287,12 +287,12 @@ store_multi (CT ct, mhstoreinfo_t info)
     for (part = m->mp_parts; part; part = part->mp_next) {
        CT  p = part->mp_part;
 
     for (part = m->mp_parts; part; part = part->mp_next) {
        CT  p = part->mp_part;
 

-       if (part_ok (p, 1) && type_ok (p, 1)) {
+       if (part_ok (p) && type_ok (p, 1)) {

            if (ct->c_storage) {
                /* Support mhstore -outfile.  The MIME parser doesn't
                   load c_storage, so we know that p->c_storage is
                   NULL here. */
            if (ct->c_storage) {
                /* Support mhstore -outfile.  The MIME parser doesn't
                   load c_storage, so we know that p->c_storage is
                   NULL here. */

-               p->c_storage = add (ct->c_storage, NULL);
+               p->c_storage = mh_xstrdup(ct->c_storage);

            }
            result = store_switch (p, info);
 
            }
            result = store_switch (p, info);
 


@@ -341,13 +341,11 @@ store_partial (CT ct, mhstoreinfo_t info)
     }
 
     if (hi == 0) {
     }
 
     if (hi == 0) {

-       advise (NULL, "missing (at least) last part of multipart message");
+       inform("missing (at least) last part of multipart message");

        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    if ((base = (CT *) mh_xcalloc ((size_t) (i + 1), sizeof(*base))) == NULL)
-       adios (NULL, "out of memory");
-
+    base = mh_xcalloc(i + 1, sizeof *base);

     ctq = base;
     for (ctp = info->cts; *ctp; ctp++) {
        p = *ctp;
     ctq = base;
     for (ctp = info->cts; *ctp; ctp++) {
        p = *ctp;


@@ -366,22 +364,21 @@ store_partial (CT ct, mhstoreinfo_t info)
     for (ctq = base; *ctq; ctq++) {
        p = *ctq;
        pm = (struct partial *) p->c_ctparams;
     for (ctq = base; *ctq; ctq++) {
        p = *ctq;
        pm = (struct partial *) p->c_ctparams;

-       if (pm->pm_marked != cur) {
-           if (pm->pm_marked == cur - 1) {
-               admonish (NULL,
-                         "duplicate part %d of %d part multipart message",
-                         pm->pm_marked, hi);
-               continue;
-           }
+       if (pm->pm_marked == cur) {
+           cur++;
+            continue;
+        }
+
+        if (pm->pm_marked == cur - 1) {
+            inform("duplicate part %d of %d part multipart message, continuing...",
+                      pm->pm_marked, hi);
+            continue;
+        }

 
 missing_part:
 
 missing_part:

-           advise (NULL,
-                   "missing %spart %d of %d part multipart message",
-                   cur != hi ? "(at least) " : "", cur, hi);
-           goto losing;
-       }
-        else
-           cur++;
+        inform("missing %spart %d of %d part multipart message",
+            cur != hi ? "(at least) " : "", cur, hi);
+        goto losing;

     }
     if (hi != --cur) {
        cur = hi;
     }
     if (hi != --cur) {
        cur = hi;


@@ -397,7 +394,7 @@ missing_part:
     ct = *ctq++;
     if (store_content (ct, NULL, info) == NOTOK) {
 losing:
     ct = *ctq++;
     if (store_content (ct, NULL, info) == NOTOK) {
 losing:

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

        return NOTOK;
     }
 
        return NOTOK;
     }
 


@@ -407,7 +404,7 @@ losing:
            goto losing;
     }
 
            goto losing;
     }
 

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

     return OK;
 }
 
     return OK;
 }
 


@@ -433,16 +430,11 @@ store_external (CT ct, mhstoreinfo_t info)
     if (info->autosw) {
        char *cp;
 
     if (info->autosw) {
        char *cp;
 

-       if ((cp = e->eb_name)
-           && *cp != '/'
-           && *cp != '.'
-           && *cp != '|'
-           && *cp != '!'
-           && !strchr (cp, '%')) {
+       if ((cp = e->eb_name) && use_param_as_filename(cp)) {

            if (!ct->c_storeproc)
            if (!ct->c_storeproc)

-               ct->c_storeproc = add (cp, NULL);
+               ct->c_storeproc = mh_xstrdup(cp);

            if (!p->c_storeproc)
            if (!p->c_storeproc)

-               p->c_storeproc = add (cp, NULL);
+               p->c_storeproc = mh_xstrdup(cp);

        }
     }
 
        }
     }
 


@@ -458,7 +450,7 @@ store_external (CT ct, mhstoreinfo_t info)
     if (ct->c_storage) {
        /* Support mhstore -outfile.  The MIME parser doesn't load
           c_storage, so we know that p->c_storage is NULL here. */
     if (ct->c_storage) {
        /* Support mhstore -outfile.  The MIME parser doesn't load
           c_storage, so we know that p->c_storage is NULL here. */

-       p->c_storage = add (ct->c_storage, NULL);
+       p->c_storage = mh_xstrdup(ct->c_storage);

     }
     result = store_switch (p, info);
 
     }
     result = store_switch (p, info);
 


@@ -535,11 +527,11 @@ store_content (CT ct, CT p, mhstoreinfo_t info)
        if (p) {
            appending = 1;
             if (! ct->c_storage) {
        if (p) {
            appending = 1;
             if (! ct->c_storage) {

-               ct->c_storage = add (p->c_storage, NULL);
+               ct->c_storage = mh_xstrdup(FENDNULL(p->c_storage));

 
                /* record the folder name */
                if (p->c_folder) {
 
                /* record the folder name */
                if (p->c_folder) {

-                   ct->c_folder = add (p->c_folder, NULL);
+                   ct->c_folder = mh_xstrdup(p->c_folder);

                }
            }
            goto got_filename;
                }
            }
            goto got_filename;


@@ -577,7 +569,7 @@ store_content (CT ct, CT p, mhstoreinfo_t info)
                adios(NULL, "unable to create temporary file in %s",
                      get_temp_dir());
            }
                adios(NULL, "unable to create temporary file in %s",
                      get_temp_dir());
            }

-           ct->c_storage = add (tmpfilenam, NULL);
+           ct->c_storage = mh_xstrdup(tmpfilenam);

 
            /* Get the folder name */
            if (cp[1])
 
            /* Get the folder name */
            if (cp[1])


@@ -589,7 +581,7 @@ store_content (CT ct, CT p, mhstoreinfo_t info)
            create_folder(m_mailpath(folder), 0, exit);
 
            /* Record the folder name */
            create_folder(m_mailpath(folder), 0, exit);
 
            /* Record the folder name */

-           ct->c_folder = add (folder, NULL);
+           ct->c_folder = mh_xstrdup(folder);

 
            if (cp[1])
                free (folder);
 
            if (cp[1])
                free (folder);


@@ -611,7 +603,7 @@ store_content (CT ct, CT p, mhstoreinfo_t info)
            return show_content_aux (ct, 0, buffer + 1, info->dir, NULL);
 
         /* record the filename */
            return show_content_aux (ct, 0, buffer + 1, info->dir, NULL);
 
         /* record the filename */

-       if ((ct->c_storage = clobber_check (add (buffer, NULL), info)) ==
+       if ((ct->c_storage = clobber_check (mh_xstrdup(buffer), info)) ==

            NULL) {
            return NOTOK;
        }
            NULL) {
            return NOTOK;
        }


@@ -652,7 +644,7 @@ got_filename:
             if (first_partial)
                 fprintf (stderr, "reassembling partials ");
             if (last_partial)
             if (first_partial)
                 fprintf (stderr, "reassembling partials ");
             if (last_partial)

-                fprintf (stderr, "%s", ct->c_file);
+                fputs(ct->c_file, stderr);

             else
                 fprintf (stderr, "%s,", ct->c_file);
         } else {
             else
                 fprintf (stderr, "%s,", ct->c_file);
         } else {


@@ -676,7 +668,7 @@ got_filename:
                 int cwdlen = strlen (info->cwd);
 
                 fprintf (stderr, " as file %s\n",
                 int cwdlen = strlen (info->cwd);
 
                 fprintf (stderr, " as file %s\n",

-                         strncmp (ct->c_storage, info->cwd, cwdlen)
+                         !has_prefix(ct->c_storage, info->cwd)

                          || ct->c_storage[cwdlen] != '/'
                          ? ct->c_storage : ct->c_storage + cwdlen + 1);
             }
                          || ct->c_storage[cwdlen] != '/'
                          ? ct->c_storage : ct->c_storage + cwdlen + 1);
             }


@@ -711,7 +703,7 @@ output_content_file (CT ct, int appending)
        int cc, fd;
 
        if (!ct->c_ceopenfnx) {
        int cc, fd;
 
        if (!ct->c_ceopenfnx) {

-           advise (NULL, "don't know how to decode part %s of message %s",
+           inform("don't know how to decode part %s of message %s",

                    ct->c_partno, ct->c_file);
            return NOTOK;
        }
                    ct->c_partno, ct->c_file);
            return NOTOK;
        }


@@ -837,7 +829,7 @@ losing:
        }
     }
 
        }
     }
 

-    while (fgets (buffer, sizeof(buffer) - 1, ct->c_fp)) {
+    while (fgets (buffer, sizeof buffer, ct->c_fp)) {

        if ((pos += strlen (buffer)) > last) {
            int diff;
 
        if ((pos += strlen (buffer)) > last) {
            int diff;
 


@@ -908,9 +900,9 @@ output_content_folder (char *folder, char *filename)
     /* Read the folder. */
     if ((mp = folder_read (folder, 0))) {
        /* Link file into folder */
     /* Read the folder. */
     if ((mp = folder_read (folder, 0))) {
        /* Link file into folder */

-       msgnum = folder_addmsg (&mp, filename, 0, 0, 0, 0, (char *)0);
+       msgnum = folder_addmsg (&mp, filename, 0, 0, 0, 0, NULL);

     } else {
     } else {

-       advise (NULL, "unable to read folder %s", folder);
+       inform("unable to read folder %s", folder);

        return NOTOK;
     }
 
        return NOTOK;
     }
 


@@ -955,7 +947,9 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
      * appropriate directory.
      */
     if (*cp != '/' && *cp != '|' && *cp != '!') {
      * appropriate directory.
      */
     if (*cp != '/' && *cp != '|' && *cp != '!') {

-       snprintf (bp, buflen, "%s/", dir[1] ? dir : "");
+        if (!strcmp(dir, "/"))
+            dir = ""; /* Don't start with "//". */
+       snprintf (bp, buflen, "%s/", dir);

        len = strlen (bp);
        bp += len;
        buflen -= len;
        len = strlen (bp);
        bp += len;
        buflen -= len;


@@ -976,7 +970,8 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
                        *bp = '\0';
                        buflen--;
                        continue;
                        *bp = '\0';
                        buflen--;
                        continue;

-                   } else {
+                   }
+                    {

                        PM pm;
                        char *s = "";
 
                        PM pm;
                        char *s = "";
 


@@ -1003,7 +998,7 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
                    break;
 
                case 'p':
                    break;
 
                case 'p':

-                   /* insert part number withouth leading dot */
+                   /* insert part number without leading dot */

                    if (ct->c_partno)
                        strncpy (bp, ct->c_partno, buflen);
                    break;
                    if (ct->c_partno)
                        strncpy (bp, ct->c_partno, buflen);
                    break;


@@ -1070,18 +1065,13 @@ get_storeproc (CT ct)
      * use that (RFC-2183).
      */
     if (ct->c_dispo) {
      * use that (RFC-2183).
      */
     if (ct->c_dispo) {

-       if ((cp = get_param(ct->c_dispo_first, "filename", '_', 0))
-               && *cp != '/'
-               && *cp != '.'
-               && *cp != '|'
-               && *cp != '!'
-               && !strchr (cp, '%')) {
-               ct->c_storeproc = add (cp, NULL);
+       if ((cp = get_param(ct->c_dispo_first, "filename", '_', 0)) &&
+            use_param_as_filename(cp)) {
+               ct->c_storeproc = mh_xstrdup(cp);

                free(cp);
                return;
        }
                free(cp);
                return;
        }

-       if (cp)
-           free(cp);
+        mh_xfree(cp);

     }
 
     /*
     }
 
     /*


@@ -1090,17 +1080,12 @@ get_storeproc (CT ct)
      * the storeproc.
      */
     ci = &ct->c_ctinfo;
      * the storeproc.
      */
     ci = &ct->c_ctinfo;

-    if ((cp = get_param(ci->ci_first_pm, "name", '_', 0))
-         && *cp != '/'
-         && *cp != '.'
-         && *cp != '|'
-         && *cp != '!'
-         && !strchr (cp, '%')) {
-           ct->c_storeproc = add (cp, NULL);
+    if ((cp = get_param(ci->ci_first_pm, "name", '_', 0)) &&
+        use_param_as_filename(cp)) {
+           ct->c_storeproc = mh_xstrdup(cp);

 
     }
 
     }

-    if (cp)
-       free(cp);
+    mh_xfree(cp);

 }
 
 
 }
 
 


@@ -1140,19 +1125,22 @@ static
 enum clobber_policy_t
 clobber_policy (const char *value) {
   if (value == NULL  ||  ! strcasecmp (value, "always")) {
 enum clobber_policy_t
 clobber_policy (const char *value) {
   if (value == NULL  ||  ! strcasecmp (value, "always")) {

-  } else if (! strcasecmp (value, "auto")) {
+    return NMH_CLOBBER_ALWAYS;
+  }
+  if (! strcasecmp (value, "auto")) {

     return NMH_CLOBBER_AUTO;
     return NMH_CLOBBER_AUTO;

-  } else if (! strcasecmp (value, "suffix")) {
+  }
+  if (! strcasecmp (value, "suffix")) {

     return NMH_CLOBBER_SUFFIX;
     return NMH_CLOBBER_SUFFIX;

-  } else if (! strcasecmp (value, "ask")) {
+  }
+  if (! strcasecmp (value, "ask")) {

     return NMH_CLOBBER_ASK;
     return NMH_CLOBBER_ASK;

-  } else if (! strcasecmp (value, "never")) {
+  }
+  if (! strcasecmp (value, "never")) {

     return NMH_CLOBBER_NEVER;
     return NMH_CLOBBER_NEVER;

-  } else {
-    adios (NULL, "invalid argument, %s, to clobber", value);

   }
 
   }
 

-  return NMH_CLOBBER_ALWAYS;
+  adios (NULL, "invalid argument, %s, to clobber", value);

 }
 
 
 }
 
 


@@ -1187,7 +1175,7 @@ next_version (char *file, enum clobber_policy_t clobber_policy) {
 
       default:
         /* Should never get here. */
 
       default:
         /* Should never get here. */

-        advise (NULL, "will not overwrite %s, invalid clobber policy", buffer);
+        inform("will not overwrite %s, invalid clobber policy", buffer);

         free (buffer);
         return NULL;
     }
         free (buffer);
         return NULL;
     }


@@ -1208,7 +1196,7 @@ next_version (char *file, enum clobber_policy_t clobber_policy) {
   free (file);
 
   if (version >= max_versions) {
   free (file);
 
   if (version >= max_versions) {

-    advise (NULL, "will not overwrite %s, too many versions", buffer);
+    inform("will not overwrite %s, too many versions", buffer);

     free (buffer);
     buffer = NULL;
   }
     free (buffer);
     buffer = NULL;
   }


@@ -1240,7 +1228,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
     /* Save cwd for possible use in loop below. */
     char *slash;
 
     /* Save cwd for possible use in loop below. */
     char *slash;
 

-    cwd = add (original_file, NULL);
+    cwd = mh_xstrdup(original_file);

     slash = strrchr (cwd, '/');
 
     if (slash) {
     slash = strrchr (cwd, '/');
 
     if (slash) {


@@ -1286,11 +1274,11 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
           if (isatty (fileno (stdin))) {
             char *prompt =
               concat ("Overwrite \"", file, "\" [y/n/rename]? ", NULL);
           if (isatty (fileno (stdin))) {
             char *prompt =
               concat ("Overwrite \"", file, "\" [y/n/rename]? ", NULL);

-            ans = getans (prompt, answer);
+            ans = read_switch_multiword (prompt, answer);

             free (prompt);
           } else {
             /* Overwrite, that's what nmh used to do.  And warn. */
             free (prompt);
           } else {
             /* Overwrite, that's what nmh used to do.  And warn. */

-            advise (NULL, "-clobber ask but no tty, so overwrite %s", file);
+            inform("-clobber ask but no tty, so overwrite %s", file);

             break;
           }
 
             break;
           }
 


@@ -1310,20 +1298,17 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
                 file = NULL;
                 ++info->files_not_clobbered;
               } else {
                 file = NULL;
                 ++info->files_not_clobbered;
               } else {

-                char *newline = strchr (buf, '\n');
-                if (newline) {
-                  *newline = '\0';
-                }
+                trim_suffix_c(buf, '\n');

               }
 
               free (file);
 
               if (buf[0] == '/') {
                 /* Full path, use it. */
               }
 
               free (file);
 
               if (buf[0] == '/') {
                 /* Full path, use it. */

-                file = add (buf, NULL);
+                file = mh_xstrdup(buf);

               } else {
                 /* Relative path. */
               } else {
                 /* Relative path. */

-                file = cwd  ?  concat (cwd, "/", buf, NULL)  :  add (buf, NULL);
+                file = cwd  ?  concat (cwd, "/", buf, NULL)  :  mh_xstrdup(buf);

               }
 
               check_again = 1;
               }
 
               check_again = 1;


@@ -1337,7 +1322,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
         if (stat (file, &st) == OK) {
           /* Keep count of files that would have been clobbered,
              and return that as process exit status. */
         if (stat (file, &st) == OK) {
           /* Keep count of files that would have been clobbered,
              and return that as process exit status. */

-          advise (NULL, "will not overwrite %s with -clobber never", file);
+          inform("will not overwrite %s with -clobber never", file);

           free (file);
           file = NULL;
           ++info->files_not_clobbered;
           free (file);
           file = NULL;
           ++info->files_not_clobbered;


@@ -1353,5 +1338,12 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
   return file;
 }
 
   return file;
 }
 

+static bool use_param_as_filename(const char *p)
+{
+    /* Preserve result of original test that considered an empty string
+     * OK. */
+    return !*p || (!strchr("/.|!", *p) && !strchr(p, '%'));
+}
+

 /* -clobber support */
 /******************************************************************************/
 /* -clobber support */
 /******************************************************************************/