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

[nmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 08d2240734ade1a54337b63d3a32c9d2f0526f38..1dc44e7a6cb42e5d874de805d79db3db8a7b7837 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -13,12 +13,14 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include "mhmisc.h"
 #include <h/mhcachesbr.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 #include "mhfree.h"
 #ifdef HAVE_ICONV
 # include <iconv.h>
 #endif /* HAVE_ICONV */
+#include "sbr/base64.h"
 
 
 extern int debugsw;
@@ -33,19 +35,18 @@ int checksw = 0;    /* check Content-MD5 field */
  * 3) Suppress the warning about extraneous trailing ';' in header parameter
  *    lists.
  */
-int skip_mp_cte_check;
-int suppress_bogus_mp_content_warning;
-int bogus_mp_content;
-int suppress_extraneous_trailing_semicolon_warning;
+bool skip_mp_cte_check;
+bool suppress_bogus_mp_content_warning;
+bool bogus_mp_content;
+bool suppress_extraneous_trailing_semicolon_warning;
 
 /*
  * By default, suppress warning about multiple MIME-Version header fields.
  */
-int suppress_multiple_mime_version_warning = 1;
+bool suppress_multiple_mime_version_warning = true;
 
 /* list of preferred type/subtype pairs, for -prefer */
-char *preferred_types[NPREFS],
-     *preferred_subtypes[NPREFS];
+mime_type_subtype mime_preference[NPREFS];
 int npreferred;
 
 
@@ -106,11 +107,6 @@ static struct k2v EncodingType[] = {
 };
 
 
-/* mhmisc.c */
-int part_ok (CT);
-int type_ok (CT, int);
-void content_error (char *, CT, char *, ...);
-
 /*
  * static prototypes
  */
@@ -202,7 +198,7 @@ parse_mime (char *file)
     size_t n;
     struct stat statbuf;
 
-    bogus_mp_content = 0;
+    bogus_mp_content = false;
 
     /*
      * Check if file is actually standard input
@@ -733,7 +729,7 @@ magic_skip:
      * Get any <Content-Id> given in buffer
      */
     if (magic && *cp == '<') {
-        mh_xfree(ct->c_id);
+        free(ct->c_id);
         ct->c_id = NULL;
        if (!(dp = strchr(ct->c_id = ++cp, '>'))) {
            inform("invalid ID in message %s", ct->c_file);
@@ -1112,7 +1108,7 @@ InitMultiPart (CT ct)
 
        bp = cte + strlen (cte) - 1;
        while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';
-       for (bp = cte; *bp && isblank ((unsigned char) *bp); ++bp) continue;
+       for (bp = cte; isblank((unsigned char)*bp); ++bp) continue;
 
        inform("\"%s/%s\" type in message %s must be encoded in\n"
            "7bit, 8bit, or binary, per RFC 2045 (6.4).  "
@@ -1227,7 +1223,7 @@ end_part:
     if (! suppress_bogus_mp_content_warning) {
         inform("bogus multipart content in message %s", ct->c_file);
     }
-    bogus_mp_content = 1;
+    bogus_mp_content = true;
 
     if (!inout && part) {
        p = part->mp_part;
@@ -1320,7 +1316,7 @@ reverse_parts (CT ct)
 }
 
 static void
-move_preferred_part (CT ct, char *type, char *subtype)
+move_preferred_part(CT ct, mime_type_subtype *pref)
 {
     struct multipart *m = (struct multipart *) ct->c_ctparams;
     struct part *part, *prev, *head, *nhead, *ntail;
@@ -1344,8 +1340,9 @@ move_preferred_part (CT ct, char *type, char *subtype)
     part = head->mp_next;
     while (part != NULL) {
        ci = &part->mp_part->c_ctinfo;
-       if (!strcasecmp(ci->ci_type, type) &&
-               (!subtype || !strcasecmp(ci->ci_subtype, subtype))) {
+       if (!strcasecmp(ci->ci_type, pref->type) &&
+            (!pref->subtype ||
+                !strcasecmp(ci->ci_subtype, pref->subtype))) {
            prev->mp_next = part->mp_next;
            part->mp_next = NULL;
            ntail->mp_next = part;
@@ -1358,7 +1355,6 @@ move_preferred_part (CT ct, char *type, char *subtype)
     }
     ntail->mp_next = head->mp_next;
     m->mp_parts = nhead->mp_next;
-
 }
 
 /*
@@ -1370,8 +1366,8 @@ static void
 prefer_parts(CT ct)
 {
     int i;
-    for (i = npreferred-1; i >= 0; i--)
-       move_preferred_part(ct, preferred_types[i], preferred_subtypes[i]);
+    for (i = 0; i < npreferred; i++)
+       move_preferred_part(ct, mime_preference + i);
 }
 
 
@@ -2330,7 +2326,7 @@ openExternal (CT ct, CT cb, CE ce, char **file, int *fd)
        goto ready_already;
     }
 
-    if (find_cache (ct, rcachesw, (int *) 0, cb->c_id,
+    if (find_cache(ct, rcachesw, NULL, cb->c_id,
                cachefile, sizeof(cachefile)) != NOTOK) {
        if ((ce->ce_fp = fopen (cachefile, "r"))) {
            ce->ce_file = mh_xstrdup(cachefile);
@@ -2559,7 +2555,7 @@ openFTP (CT ct, char **file)
     }
 
     {
-       int child_id, i, vecp;
+       int child_id, vecp;
        char *vec[9];
 
        vecp = 0;
@@ -2576,8 +2572,7 @@ openFTP (CT ct, char **file)
 
        fflush (stdout);
 
-       for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-           sleep (5);
+       child_id = fork();
        switch (child_id) {
            case NOTOK:
                adios ("fork", "unable to");
@@ -2655,7 +2650,7 @@ InitMail (CT ct)
 static int
 openMail (CT ct, char **file)
 {
-    int        child_id, fd, i, vecp;
+    int child_id, fd, vecp;
     int len, buflen;
     char *bp, buffer[BUFSIZ], *vec[7];
     struct exbody *e = ct->c_ctexbody;
@@ -2711,8 +2706,7 @@ openMail (CT ct, char **file)
     vec[vecp++] = e->eb_body;
     vec[vecp] = NULL;
 
-    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-       sleep (5);
+    child_id = fork();
     switch (child_id) {
        case NOTOK:
            advise ("fork", "unable to");
@@ -2751,7 +2745,7 @@ openMail (CT ct, char **file)
 
     /* showproc is for mhshow and mhstore, though mhlist -debug
      * prints it, too. */
-    mh_xfree(ct->c_showproc);
+    free(ct->c_showproc);
     ct->c_showproc = mh_xstrdup("true");
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
@@ -3402,7 +3396,7 @@ parse_header_attrs (const char *filename, const char *fieldname,
                     inform("missing language tag in message %s's %s: field\n"
                         "    (parameter %s)", filename, fieldname, nameptr);
                    free(nameptr);
-                    mh_xfree(charset);
+                    free(charset);
                    return NOTOK;
                }
 
@@ -3425,8 +3419,8 @@ parse_header_attrs (const char *filename, const char *fieldname,
                         inform("invalid encoded sequence in message %s's %s: field\n"
                             "    (parameter %s)", filename, fieldname, nameptr);
                        free(nameptr);
-                        mh_xfree(charset);
-                        mh_xfree(lang);
+                        free(charset);
+                        free(lang);
                        return NOTOK;
                    }
                    vp += 2;
@@ -3466,8 +3460,8 @@ bad_quote:
                         inform("invalid quoted-string in message %s's %s: field\n"
                             "    (parameter %s)", filename, fieldname, nameptr);
                        free(nameptr);
-                        mh_xfree(charset);
-                        mh_xfree(lang);
+                        free(charset);
+                        free(lang);
                        return NOTOK;
                    case '"':
                        break;
@@ -3574,9 +3568,9 @@ bad_quote:
             */
 
            if (index == 0 && encoded) {
-                mh_xfree(pp->charset);
+                free(pp->charset);
                pp->charset = charset;
-                mh_xfree(pp->lang);
+                free(pp->lang);
                pp->lang = lang;
            }
        } else {
@@ -3675,7 +3669,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 
        if (strlen(params->pm_name) > CPERLIN) {
            inform("Parameter name \"%s\" is too long", params->pm_name);
-            mh_xfree(paramout);
+            free(paramout);
            return NULL;
        }
 
@@ -3712,7 +3706,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
                                 numchars, valoff);
 
            if (i == 0) {
-                mh_xfree(paramout);
+                free(paramout);
                return NULL;
            }
 
@@ -3775,7 +3769,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
                             strlen(params->pm_value + valoff), valoff);
 
        if (i == 0) {
-            mh_xfree(paramout);
+            free(paramout);
            return NULL;
        }