ap.c, dp.c: exit(3) with 0 or 1, not [0, MAX_EXIT].

[nmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 758819a059f7a81c44b4da212fe9e5c909893d13..f22db99234c12562a4107c7d25b7b487280f304c 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * mhbuildsbr.c -- routines to expand/translate MIME composition files
+/* mhbuildsbr.c -- routines to expand/translate MIME composition files

  *
  * 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


@@ -20,9 +18,17 @@
 #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 "h/mhcachesbr.h"
+#include "mhmisc.h"
+#include "../sbr/m_mktemp.h"
+#include "../sbr/message_id.h"
+#include "../sbr/mime_type.h"
+#include "mhfree.h"
+#include "mhshowsbr.h"

 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>


@@ -36,10 +42,6 @@ extern int listsw;
 extern int rfc934sw;
 extern int contentidsw;
 
 extern int rfc934sw;
 extern int contentidsw;
 

-/* cache policies */
-extern int rcachesw;   /* mhcachesbr.c */
-extern int wcachesw;   /* mhcachesbr.c */
-

 static char prefix[] = "----- =_aaaaaaaaaa";
 
 struct attach_list {
 static char prefix[] = "----- =_aaaaaaaaaa";
 
 struct attach_list {


@@ -54,24 +56,6 @@ typedef struct convert_list {
     struct convert_list *next;
 } convert_list;
 
     struct convert_list *next;
 } convert_list;
 

-/*
- * Maximum size of URL token in message/external-body
- */
-
-#define MAXURLTOKEN 40
-
-
-/* mhmisc.c */
-void content_error (char *, CT, char *, ...);
-
-/* mhcachesbr.c */
-int find_cache (CT, int, int *, char *, char *, int);
-
-/* mhfree.c */
-extern CT *cts;
-void freects_done (int) NORETURN;
-void free_ctinfo (CT);
-void free_encoding (CT, int);

 
 /*
  * static prototypes
 
 /*
  * static prototypes


@@ -139,14 +123,14 @@ build_mime (char *infile, int autobuild, int dist, int directives,
            int header_encoding, size_t maxunencoded, int verbose)
 {
     int        compnum, state;
            int header_encoding, size_t maxunencoded, int verbose)
 {
     int        compnum, state;

-    char buf[BUFSIZ], name[NAMESZ];
+    char buf[NMH_BUFSIZ], name[NAMESZ];

     char *cp, *np, *vp;
     struct multipart *m;
     struct part **pp;
     CT ct;
     FILE *in;
     HF hp;
     char *cp, *np, *vp;
     struct multipart *m;
     struct part **pp;
     CT ct;
     FILE *in;
     HF hp;

-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;

     struct attach_list *attach_head = NULL, *attach_tail = NULL, *at_entry;
     convert_list *convert_head = NULL, *convert_tail = NULL, *convert;
 
     struct attach_list *attach_head = NULL, *attach_tail = NULL, *at_entry;
     convert_list *convert_head = NULL, *convert_tail = NULL, *convert;
 


@@ -161,8 +145,7 @@ build_mime (char *infile, int autobuild, int dist, int directives,
     /*
      * Allocate space for primary (outside) content
      */
     /*
      * Allocate space for primary (outside) content
      */

-    if ((ct = (CT) mh_xcalloc (1, sizeof(*ct))) == NULL)
-       adios (NULL, "out of memory");
+    NEW0(ct);

 
     /*
      * Allocate structure for handling decoded content
 
     /*
      * Allocate structure for handling decoded content


@@ -176,10 +159,11 @@ build_mime (char *infile, int autobuild, int dist, int directives,
      * draft into the linked list of header fields for
      * the new MIME message.
      */
      * draft into the linked list of header fields for
      * the new MIME message.
      */

-    m_getfld_track_filepos (&gstate, in);
+    gstate = m_getfld_state_init(in);
+    m_getfld_track_filepos2(&gstate);

     for (compnum = 1;;) {
        int bufsz = sizeof buf;
     for (compnum = 1;;) {
        int bufsz = sizeof buf;

-       switch (state = m_getfld (&gstate, name, buf, &bufsz, in)) {
+       switch (state = m_getfld2(&gstate, name, buf, &bufsz)) {

        case FLD:
        case FLDPLUS:
            compnum++;
        case FLD:
        case FLDPLUS:
            compnum++;


@@ -191,28 +175,27 @@ build_mime (char *infile, int autobuild, int dist, int directives,
                    fclose(in);
                    free (ct);
                    return NULL;
                    fclose(in);
                    free (ct);
                    return NULL;

-               } else {
-                   adios (NULL, "draft shouldn't contain %s: field", name);

                }
                }

+                adios (NULL, "draft shouldn't contain %s: field", name);

            }
 
            /* ignore any Content-Type fields in the header */
            if (!strcasecmp (name, TYPE_FIELD)) {
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
            }
 
            /* ignore any Content-Type fields in the header */
            if (!strcasecmp (name, TYPE_FIELD)) {
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;

-                   state = m_getfld (&gstate, name, buf, &bufsz, in);
+                   state = m_getfld2(&gstate, name, buf, &bufsz);

                }
                goto finish_field;
            }
 
            /* get copies of the buffers */
                }
                goto finish_field;
            }
 
            /* get copies of the buffers */

-           np = add (name, NULL);
-           vp = add (buf, NULL);
+           np = mh_xstrdup(name);
+           vp = mh_xstrdup(buf);

 
            /* if necessary, get rest of field */
            while (state == FLDPLUS) {
                bufsz = sizeof buf;
 
            /* if necessary, get rest of field */
            while (state == FLDPLUS) {
                bufsz = sizeof buf;

-               state = m_getfld (&gstate, name, buf, &bufsz, in);
+               state = m_getfld2(&gstate, name, buf, &bufsz);

                vp = add (buf, vp);     /* add to previous value */
            }
 
                vp = add (buf, vp);     /* add to previous value */
            }
 


@@ -244,8 +227,8 @@ build_mime (char *infile, int autobuild, int dist, int directives,
                    goto finish_field;
                }
 
                    goto finish_field;
                }
 

-               entry = mh_xmalloc(sizeof(*entry));
-               entry->filename = getcpy(s);
+               NEW(entry);
+               entry->filename = mh_xstrdup(s);

                entry->next = NULL;
                free(vp);
 
                entry->next = NULL;
                free(vp);
 


@@ -256,14 +239,14 @@ build_mime (char *infile, int autobuild, int dist, int directives,
                    attach_head = attach_tail = entry;
                }
            } else if (strncasecmp(MHBUILD_FILE_PSEUDOHEADER, np,
                    attach_head = attach_tail = entry;
                }
            } else if (strncasecmp(MHBUILD_FILE_PSEUDOHEADER, np,

-                                   strlen (MHBUILD_FILE_PSEUDOHEADER)) == 0) {
+                                   LEN(MHBUILD_FILE_PSEUDOHEADER)) == 0) {

                 /* E.g.,
                  * Nmh-mhbuild-file-text/calendar: /home/user/Mail/inbox/9
                  */
                 /* E.g.,
                  * Nmh-mhbuild-file-text/calendar: /home/user/Mail/inbox/9
                  */

-                char *type = np + strlen (MHBUILD_FILE_PSEUDOHEADER);
+                char *type = np + LEN(MHBUILD_FILE_PSEUDOHEADER);

                 char *filename = vp;
 
                 char *filename = vp;
 

-                /* vp should begin with a space because m_getfld()
+                /* vp should begin with a space because m_getfld2()

                    includes the space after the colon in buf. */
                 while (isspace((unsigned char) *filename)) { ++filename; }
                 /* Trim trailing newline and any other whitespace. */
                    includes the space after the colon in buf. */
                 while (isspace((unsigned char) *filename)) { ++filename; }
                 /* Trim trailing newline and any other whitespace. */


@@ -278,12 +261,12 @@ build_mime (char *infile, int autobuild, int dist, int directives,
                         adios (NULL, "Multiple %s headers with different files"
                                " not allowed", type);
                     } else {
                         adios (NULL, "Multiple %s headers with different files"
                                " not allowed", type);
                     } else {

-                        convert->filename = getcpy (filename);
+                        convert->filename = mh_xstrdup(filename);

                     }
                 } else {
                     }
                 } else {

-                    convert = mh_xcalloc (sizeof *convert, 1);
-                    convert->filename = getcpy (filename);
-                    convert->type = getcpy (type);
+                    NEW0(convert);
+                    convert->filename = mh_xstrdup(filename);
+                    convert->type = mh_xstrdup(type);

 
                     if (convert_tail) {
                         convert_tail->next = convert;
 
                     if (convert_tail) {
                         convert_tail->next = convert;


@@ -296,14 +279,14 @@ build_mime (char *infile, int autobuild, int dist, int directives,
                 free (vp);
                 free (np);
             } else if (strncasecmp(MHBUILD_ARGS_PSEUDOHEADER, np,
                 free (vp);
                 free (np);
             } else if (strncasecmp(MHBUILD_ARGS_PSEUDOHEADER, np,

-                                   strlen (MHBUILD_ARGS_PSEUDOHEADER)) == 0) {
+                                   LEN(MHBUILD_ARGS_PSEUDOHEADER)) == 0) {

                 /* E.g.,
                  * Nmh-mhbuild-args-text/calendar: -reply accept
                  */
                 /* E.g.,
                  * Nmh-mhbuild-args-text/calendar: -reply accept
                  */

-                char *type = np + strlen (MHBUILD_ARGS_PSEUDOHEADER);
+                char *type = np + LEN(MHBUILD_ARGS_PSEUDOHEADER);

                 char *argstring = vp;
 
                 char *argstring = vp;
 

-                /* vp should begin with a space because m_getfld()
+                /* vp should begin with a space because m_getfld2()

                    includes the space after the colon in buf. */
                 while (isspace((unsigned char) *argstring)) { ++argstring; }
                 /* Trim trailing newline and any other whitespace. */
                    includes the space after the colon in buf. */
                 while (isspace((unsigned char) *argstring)) { ++argstring; }
                 /* Trim trailing newline and any other whitespace. */


@@ -318,12 +301,12 @@ build_mime (char *infile, int autobuild, int dist, int directives,
                         adios (NULL, "Multiple %s headers with different "
                                "argstrings not allowed", type);
                     } else {
                         adios (NULL, "Multiple %s headers with different "
                                "argstrings not allowed", type);
                     } else {

-                        convert->argstring = getcpy (argstring);
+                        convert->argstring = mh_xstrdup(argstring);

                     }
                 } else {
                     }
                 } else {

-                    convert = mh_xcalloc (sizeof *convert, 1);
-                    convert->type = getcpy (type);
-                    convert->argstring = getcpy (argstring);
+                    NEW0(convert);
+                    convert->type = mh_xstrdup(type);
+                    convert->argstring = mh_xstrdup(argstring);

 
                     if (convert_tail) {
                         convert_tail->next = convert;
 
                     if (convert_tail) {
                         convert_tail->next = convert;


@@ -345,7 +328,7 @@ finish_field:
 
        case BODY:
            fseek (in, (long) (-strlen (buf)), SEEK_CUR);
 
        case BODY:
            fseek (in, (long) (-strlen (buf)), SEEK_CUR);

-           /* fall through */
+           break;

        case FILEEOF:
            break;
 
        case FILEEOF:
            break;
 


@@ -379,13 +362,13 @@ finish_field:
      */
 
     if (! dist) {
      */
 
     if (! dist) {

-       np = add (VRSN_FIELD, NULL);
+       np = mh_xstrdup(VRSN_FIELD);

        vp = concat (" ", VRSN_VALUE, "\n", NULL);
        add_header (ct, np, vp);
     }
 
     /*
        vp = concat (" ", VRSN_VALUE, "\n", NULL);
        add_header (ct, np, vp);
     }
 
     /*

-     * We initally assume we will find multiple contents in the
+     * We initially assume we will find multiple contents in the

      * draft.  So create a multipart/mixed content to hold everything.
      * We can remove this later, if it is not needed.
      */
      * draft.  So create a multipart/mixed content to hold everything.
      * We can remove this later, if it is not needed.
      */


@@ -394,8 +377,7 @@ finish_field:
     ct->c_type = CT_MULTIPART;
     ct->c_subtype = MULTI_MIXED;
 
     ct->c_type = CT_MULTIPART;
     ct->c_subtype = MULTI_MIXED;
 

-    if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)
-       adios (NULL, "out of memory");
+    NEW0(m);

     ct->c_ctparams = (void *) m;
     pp = &m->mp_parts;
 
     ct->c_ctparams = (void *) m;
     pp = &m->mp_parts;
 


@@ -408,14 +390,13 @@ finish_field:
        CT p;
 
        if (user_content (in, buf, &p, infile) == DONE) {
        CT p;
 
        if (user_content (in, buf, &p, infile) == DONE) {

-           admonish (NULL, "ignoring spurious #end");
+           inform("ignoring spurious #end, continuing...");

            continue;
        }
        if (!p)
            continue;
 
            continue;
        }
        if (!p)
            continue;
 

-       if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
-           adios (NULL, "out of memory");
+       NEW0(part);

        *pp = part;
        pp = &part->mp_next;
        part->mp_part = p;
        *pp = part;
        pp = &part->mp_next;
        part->mp_part = p;


@@ -435,9 +416,7 @@ finish_field:
            adios("reading", "Unable to open %s for", at_entry->filename);
        }
 
            adios("reading", "Unable to open %s for", at_entry->filename);
        }
 

-       if ((p = (CT) mh_xcalloc (1, sizeof(*p))) == NULL)
-           adios(NULL, "out of memory");
-
+       NEW0(p);

        init_decoded_content(p, infile);
 
        /*
        init_decoded_content(p, infile);
 
        /*


@@ -448,8 +427,7 @@ finish_field:
 
        setup_attach_content(p, at_entry->filename);
 
 
        setup_attach_content(p, at_entry->filename);
 

-       if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
-           adios (NULL, "out of memory");
+       NEW0(part);

        *pp = part;
        pp = &part->mp_next;
        part->mp_part = p;
        *pp = part;
        pp = &part->mp_next;
        part->mp_part = p;


@@ -474,9 +452,8 @@ finish_field:
         free (cts);
 
         /* Extract the type part (as a CT) from filename. */
         free (cts);
 
         /* Extract the type part (as a CT) from filename. */

-        if (! (cts = (CT *) mh_xcalloc ((size_t) 2, sizeof *cts))) {
-            adios (NULL, "out of memory");
-        } else if (! (cts[0] = parse_mime (convert_head->filename))) {
+        cts = mh_xcalloc(2, sizeof *cts);
+        if (! (cts[0] = parse_mime (convert_head->filename))) {

             adios (NULL, "failed to parse %s", convert_head->filename);
         }
 
             adios (NULL, "failed to parse %s", convert_head->filename);
         }
 


@@ -503,9 +480,7 @@ finish_field:
        struct part *part;
        struct text *t;
 
        struct part *part;
        struct text *t;
 

-       if ((p = (CT) mh_xcalloc (1, sizeof(*p))) == NULL)
-           adios(NULL, "out of memory");
-
+       NEW0(p);

        init_decoded_content(p, infile);
 
        if (get_ctinfo ("text/plain", p, 0) == NOTOK)
        init_decoded_content(p, infile);
 
        if (get_ctinfo ("text/plain", p, 0) == NOTOK)


@@ -519,18 +494,15 @@ finish_field:
         * So this seems like the best option available since we're going
         * to call scan_content() on this.
         */
         * So this seems like the best option available since we're going
         * to call scan_content() on this.
         */

-       p->c_cefile.ce_file = getcpy("/dev/null");
+       p->c_cefile.ce_file = mh_xstrdup("/dev/null");

        p->c_begin = ftell(in);
        p->c_end = ftell(in);
 
        p->c_begin = ftell(in);
        p->c_end = ftell(in);
 

-       if ((t = (struct text *) mh_xcalloc (1, sizeof (*t))) == NULL)
-           adios (NULL, "out of memory");
-
+       NEW0(t);

        t->tx_charset = CHARSET_SPECIFIED;
        p->c_ctparams = t;
 
        t->tx_charset = CHARSET_SPECIFIED;
        p->c_ctparams = t;
 

-       if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
-           adios (NULL, "out of memory");
+       NEW0(part);

        *pp = part;
        part->mp_part = p;
     }
        *pp = part;
        part->mp_part = p;
     }


@@ -572,6 +544,13 @@ finish_field:
     if ((cp = strchr(prefix, 'a')) == NULL)
        adios (NULL, "internal error(4)");
 
     if ((cp = strchr(prefix, 'a')) == NULL)
        adios (NULL, "internal error(4)");
 

+    /*
+     * If using EAI, force 8-bit charset.
+     */
+    if (header_encoding == CE_8BIT) {
+        set_charset (ct, 1);
+    }
+

     /*
      * Scan the contents.  Choose a transfer encoding, and
      * check if prefix for multipart boundary clashes with
     /*
      * Scan the contents.  Choose a transfer encoding, and
      * check if prefix for multipart boundary clashes with


@@ -583,8 +562,7 @@ finish_field:
         } else {
            if (*++cp == 0)
                adios (NULL, "giving up trying to find a unique delimiter string");
         } else {
            if (*++cp == 0)
                adios (NULL, "giving up trying to find a unique delimiter string");

-           else
-               (*cp)++;
+            (*cp)++;

        }
     }
 
        }
     }
 


@@ -608,7 +586,7 @@ init_decoded_content (CT ct, const char *filename)
     ct->c_ceclosefnx = close_encoding;
     ct->c_cesizefnx  = NULL;           /* since unencoded */
     ct->c_encoding = CE_7BIT;          /* Seems like a reasonable default */
     ct->c_ceclosefnx = close_encoding;
     ct->c_cesizefnx  = NULL;           /* since unencoded */
     ct->c_encoding = CE_7BIT;          /* Seems like a reasonable default */

-    ct->c_file = add(filename, NULL);
+    ct->c_file = mh_xstrdup(FENDNULL(filename));

 
     return OK;
 }
 
     return OK;
 }


@@ -618,23 +596,26 @@ static char *
 fgetstr (char *s, int n, FILE *stream)
 {
     char *cp, *ep;
 fgetstr (char *s, int n, FILE *stream)
 {
     char *cp, *ep;

-    int o_n = n;

 
 

+    ep = s + n;

     while(1) {
     while(1) {

-       for (ep = (cp = s) + o_n; cp < ep; ) {
-           int i;
+       for (cp = s; cp < ep;) {
+           int len;

 
            if (!fgets (cp, n, stream))
 
            if (!fgets (cp, n, stream))

-               return (cp != s ? s : NULL);
+                return cp == s ? NULL : s; /* "\\\nEOF" ignored. */

 
 

-           if (cp == s && *cp != '#')
-               return s;
+           if (! do_direct()  ||  (cp == s && *cp != '#'))
+               return s; /* Plaintext line. */

 
 

-           cp += (i = strlen (cp)) - 1;
-           if (i <= 1 || *cp-- != '\n' || *cp != '\\')
+           len = strlen(cp);
+           if (len <= 1)
+               break; /* Can't contain "\\\n". */
+           cp += len - 1; /* Just before NUL. */
+           if (*cp-- != '\n' || *cp != '\\')

                break;
                break;

-           *cp = '\0';
-           n -= (i - 2);
+           *cp = '\0'; /* Erase the trailing "\\\n". */
+           n -= (len - 2);

        }
 
        if (strcmp(s, "#on\n") == 0) {
        }
 
        if (strcmp(s, "#on\n") == 0) {


@@ -644,11 +625,9 @@ fgetstr (char *s, int n, FILE *stream)
        } else if (strcmp(s, "#pop\n") == 0) {
            directive_pop();
        } else {
        } else if (strcmp(s, "#pop\n") == 0) {
            directive_pop();
        } else {

-           break;
+           return s;

        }
     }
        }
     }

-
-    return s;

 }
 
 
 }
 
 


@@ -662,7 +641,7 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename)
 {
     int        extrnal, vrsn;
     char *cp, **ap;
 {
     int        extrnal, vrsn;
     char *cp, **ap;

-    char buffer[BUFSIZ];
+    char buffer[NMH_BUFSIZ];

     struct multipart *m;
     struct part **pp;
     struct stat st;
     struct multipart *m;
     struct part **pp;
     struct stat st;


@@ -677,8 +656,7 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename)
     }
 
     /* allocate basic Content structure */
     }
 
     /* allocate basic Content structure */

-    if ((ct = (CT) mh_xcalloc (1, sizeof(*ct))) == NULL)
-       adios (NULL, "out of memory");
+    NEW0(ct);

     *ctp = ct;
 
     /* allocate basic structure for handling decoded content */
     *ctp = ct;
 
     /* allocate basic structure for handling decoded content */


@@ -710,16 +688,15 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename)
        }
 
        /* use a temp file to collect the plain text lines */
        }
 
        /* use a temp file to collect the plain text lines */

-       ce->ce_file = add (cp, NULL);
+       ce->ce_file = mh_xstrdup(cp);

        ce->ce_unlink = 1;
 
        if (do_direct() && (buf[0] == '#' && buf[1] == '<')) {
            strncpy (content, buf + 2, sizeof(content));
            inlineD = 1;
            goto rock_and_roll;
        ce->ce_unlink = 1;
 
        if (do_direct() && (buf[0] == '#' && buf[1] == '<')) {
            strncpy (content, buf + 2, sizeof(content));
            inlineD = 1;
            goto rock_and_roll;

-       } else {
-           inlineD = 0;

        }
        }

+        inlineD = 0;

 
        /* the directive is implicit */
        strncpy (content, "text/plain", sizeof(content));
 
        /* the directive is implicit */
        strncpy (content, "text/plain", sizeof(content));


@@ -729,7 +706,7 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename)
            int i;
 
            if (headers >= 0 && do_direct() && uprf (buffer, DESCR_FIELD)
            int i;
 
            if (headers >= 0 && do_direct() && uprf (buffer, DESCR_FIELD)

-               && buffer[i = strlen (DESCR_FIELD)] == ':') {
+               && buffer[i = LEN(DESCR_FIELD)] == ':') {

                headers = 1;
 
 again_descr:
                headers = 1;
 
 again_descr:


@@ -752,7 +729,7 @@ again_descr:
            }
 
            if (headers >= 0 && do_direct() && uprf (buffer, DISPO_FIELD)
            }
 
            if (headers >= 0 && do_direct() && uprf (buffer, DISPO_FIELD)

-               && buffer[i = strlen (DISPO_FIELD)] == ':') {
+               && buffer[i = LEN(DISPO_FIELD)] == ':') {

                headers = 1;
 
 again_dispo:
                headers = 1;
 
 again_dispo:


@@ -816,7 +793,7 @@ rock_and_roll:
                ct->c_encoding = CE_7BIT;
                goto call_init;
            }
                ct->c_encoding = CE_7BIT;
                goto call_init;
            }

-           /* else fall... */
+           /* FALLTHRU */

        case CT_MULTIPART:
            adios (NULL, "it doesn't make sense to define an in-line %s content",
                   ct->c_type == CT_MESSAGE ? "message" : "multipart");
        case CT_MULTIPART:
            adios (NULL, "it doesn't make sense to define an in-line %s content",
                   ct->c_type == CT_MESSAGE ? "message" : "multipart");


@@ -909,8 +886,7 @@ use_forw:
             * reference, we need to create another Content structure
             * for the message/external-body to wrap it in.
             */
             * reference, we need to create another Content structure
             * for the message/external-body to wrap it in.
             */

-           if ((ct = (CT) mh_xcalloc (1, sizeof(*ct))) == NULL)
-               adios (NULL, "out of memory");
+           NEW0(ct);

            init_decoded_content(ct, infilename);
            *ctp = ct;
            if (get_ctinfo (buffer, ct, 0) == NOTOK)
            init_decoded_content(ct, infilename);
            *ctp = ct;
            if (get_ctinfo (buffer, ct, 0) == NOTOK)


@@ -918,8 +894,7 @@ use_forw:
            ct->c_type = CT_MESSAGE;
            ct->c_subtype = MESSAGE_EXTERNAL;
 
            ct->c_type = CT_MESSAGE;
            ct->c_subtype = MESSAGE_EXTERNAL;
 

-           if ((e = (struct exbody *) mh_xcalloc (1, sizeof(*e))) == NULL)
-               adios (NULL, "out of memory");
+           NEW0(e);

            ct->c_ctparams = (void *) e;
 
            e->eb_parent = ct;
            ct->c_ctparams = (void *) e;
 
            e->eb_parent = ct;


@@ -940,7 +915,7 @@ use_forw:
                    continue;
                if (!*cp)
                    adios (NULL, "empty pipe command for #%s directive", ci->ci_type);
                    continue;
                if (!*cp)
                    adios (NULL, "empty pipe command for #%s directive", ci->ci_type);

-               cp = add (cp, NULL);
+               cp = mh_xstrdup(cp);

                free (ci->ci_magic);
                ci->ci_magic = cp;
            } else {
                free (ci->ci_magic);
                ci->ci_magic = cp;
            } else {


@@ -964,7 +939,7 @@ use_forw:
            content_error (NULL, ct, "don't know how to compose content");
            done (1);
        }
            content_error (NULL, ct, "don't know how to compose content");
            done (1);
        }

-       ci->ci_magic = add (cp, NULL);
+       ci->ci_magic = mh_xstrdup(cp);

        return OK;
     }
 
        return OK;
     }
 


@@ -995,14 +970,13 @@ use_forw:
            if (*cp == '+' || *cp == '@') {
                if (folder)
                    adios (NULL, "only one folder per #forw directive");
            if (*cp == '+' || *cp == '@') {
                if (folder)
                    adios (NULL, "only one folder per #forw directive");

-               else
-                   folder = pluspath (cp);
+                folder = pluspath (cp);

            }
        }
 
        /* else, use the current folder */
        if (!folder)
            }
        }
 
        /* else, use the current folder */
        if (!folder)

-           folder = add (getfolder (1), NULL);
+           folder = mh_xstrdup(getfolder(1));

 
        if (!(mp = folder_read (folder, 0)))
            adios (NULL, "unable to read folder %s", folder);
 
        if (!(mp = folder_read (folder, 0)))
            adios (NULL, "unable to read folder %s", folder);


@@ -1028,8 +1002,7 @@ use_forw:
            ct->c_type = CT_MULTIPART;
            ct->c_subtype = MULTI_DIGEST;
 
            ct->c_type = CT_MULTIPART;
            ct->c_subtype = MULTI_DIGEST;
 

-           if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)
-               adios (NULL, "out of memory");
+           NEW0(m);

            ct->c_ctparams = (void *) m;
            pp = &m->mp_parts;
 
            ct->c_ctparams = (void *) m;
            pp = &m->mp_parts;
 


@@ -1039,8 +1012,7 @@ use_forw:
                    CT p;
                    CE pe;
 
                    CT p;
                    CE pe;
 

-                   if ((p = (CT) mh_xcalloc (1, sizeof(*p))) == NULL)
-                       adios (NULL, "out of memory");
+                   NEW0(p);

                    init_decoded_content (p, infilename);
                    pe = &p->c_cefile;
                    if (get_ctinfo ("message/rfc822", p, 0) == NOTOK)
                    init_decoded_content (p, infilename);
                    pe = &p->c_cefile;
                    if (get_ctinfo ("message/rfc822", p, 0) == NOTOK)


@@ -1049,12 +1021,11 @@ use_forw:
                    p->c_subtype = MESSAGE_RFC822;
 
                    snprintf (buffer, sizeof(buffer), "%s/%d", mp->foldpath, msgnum);
                    p->c_subtype = MESSAGE_RFC822;
 
                    snprintf (buffer, sizeof(buffer), "%s/%d", mp->foldpath, msgnum);

-                   pe->ce_file = add (buffer, NULL);
+                   pe->ce_file = mh_xstrdup(buffer);

                    if (listsw && stat (pe->ce_file, &st) != NOTOK)
                        p->c_end = (long) st.st_size;
 
                    if (listsw && stat (pe->ce_file, &st) != NOTOK)
                        p->c_end = (long) st.st_size;
 

-                   if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
-                       adios (NULL, "out of memory");
+                   NEW0(part);

                    *pp = part;
                    pp = &part->mp_next;
                    part->mp_part = p;
                    *pp = part;
                    pp = &part->mp_next;
                    part->mp_part = p;


@@ -1069,7 +1040,7 @@ use_forw:
 
            msgnum = mp->lowsel;
            snprintf (buffer, sizeof(buffer), "%s/%d", mp->foldpath, msgnum);
 
            msgnum = mp->lowsel;
            snprintf (buffer, sizeof(buffer), "%s/%d", mp->foldpath, msgnum);

-           ce->ce_file = add (buffer, NULL);
+           ce->ce_file = mh_xstrdup(buffer);

            if (listsw && stat (ce->ce_file, &st) != NOTOK)
                ct->c_end = (long) st.st_size;
        }
            if (listsw && stat (ce->ce_file, &st) != NOTOK)
                ct->c_end = (long) st.st_size;
        }


@@ -1114,8 +1085,7 @@ use_forw:
        ct->c_type = CT_MULTIPART;
        ct->c_subtype = vrsn;
 
        ct->c_type = CT_MULTIPART;
        ct->c_subtype = vrsn;
 

-       if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)
-           adios (NULL, "out of memory");
+       NEW0(m);

        ct->c_ctparams = (void *) m;
 
        pp = &m->mp_parts;
        ct->c_ctparams = (void *) m;
 
        pp = &m->mp_parts;


@@ -1131,13 +1101,12 @@ use_forw:
            if (!p)
                continue;
 
            if (!p)
                continue;
 

-           if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
-               adios (NULL, "out of memory");
+           NEW0(part);

            *pp = part;
            pp = &part->mp_next;
            part->mp_part = p;
        }
            *pp = part;
            pp = &part->mp_next;
            part->mp_part = p;
        }

-       admonish (NULL, "premature end-of-file, missing #end");
+       inform("premature end-of-file, missing #end, continuing...");

        return OK;
     }
 
        return OK;
     }
 


@@ -1161,10 +1130,10 @@ set_id (CT ct, int top)
        time (&clock);
        snprintf (contentid, sizeof(contentid), "%s\n", message_id (clock, 1));
        partno = 0;
        time (&clock);
        snprintf (contentid, sizeof(contentid), "%s\n", message_id (clock, 1));
        partno = 0;

-       msgfmt = getcpy(contentid);
+       msgfmt = mh_xstrdup(contentid);

     }
     snprintf (contentid, sizeof(contentid), msgfmt, top ? 0 : ++partno);
     }
     snprintf (contentid, sizeof(contentid), msgfmt, top ? 0 : ++partno);

-    ct->c_id = getcpy (contentid);
+    ct->c_id = mh_xstrdup(contentid);

 }
 
 
 }
 
 


@@ -1200,7 +1169,7 @@ compose_content (CT ct, int verbose)
            CT p = part->mp_part;
 
            sprintf (pp, "%d", partnum);
            CT p = part->mp_part;
 
            sprintf (pp, "%d", partnum);

-           p->c_partno = add (partnam, NULL);
+           p->c_partno = mh_xstrdup(partnam);

            if (compose_content (p, verbose) == NOTOK)
                return NOTOK;
        }
            if (compose_content (p, verbose) == NOTOK)
                return NOTOK;
        }


@@ -1234,7 +1203,7 @@ compose_content (CT ct, int verbose)
        if (listsw) {
            ct->c_end = (partnum = strlen (prefix) + 2) + 2;
            if (ct->c_rfc934)
        if (listsw) {
            ct->c_end = (partnum = strlen (prefix) + 2) + 2;
            if (ct->c_rfc934)

-               ct->c_end += 1;
+               ct->c_end++;

 
            for (part = m->mp_parts; part; part = part->mp_next)
                ct->c_end += part->mp_part->c_end + partnum;
 
            for (part = m->mp_parts; part; part = part->mp_next)
                ct->c_end += part->mp_part->c_end + partnum;


@@ -1266,7 +1235,7 @@ compose_content (CT ct, int verbose)
                adios("mhbuildsbr", "unable to create temporary file in %s",
                      get_temp_dir());
            }
                adios("mhbuildsbr", "unable to create temporary file in %s",
                      get_temp_dir());
            }

-           ce->ce_file = add (tfile, NULL);
+           ce->ce_file = mh_xstrdup(tfile);

            ce->ce_unlink = 1;
 
            xstdout = 0;
            ce->ce_unlink = 1;
 
            xstdout = 0;


@@ -1302,7 +1271,7 @@ compose_content (CT ct, int verbose)
                    case 'F':
                        /* %f, and stdout is not-redirected */
                        xstdout = 1;
                    case 'F':
                        /* %f, and stdout is not-redirected */
                        xstdout = 1;

-                       /* and fall... */
+                       /* FALLTHRU */

 
                    case 'f':
                        /*
 
                    case 'f':
                        /*


@@ -1693,11 +1662,11 @@ build_headers (CT ct, int header_encoding)
     /*
      * output the content type and subtype
      */
     /*
      * output the content type and subtype
      */

-    np = add (TYPE_FIELD, NULL);
+    np = mh_xstrdup(TYPE_FIELD);

     vp = concat (" ", ci->ci_type, "/", ci->ci_subtype, NULL);
 
     /* keep track of length of line */
     vp = concat (" ", ci->ci_type, "/", ci->ci_subtype, NULL);
 
     /* keep track of length of line */

-    len = strlen (TYPE_FIELD) + strlen (ci->ci_type)
+    len = LEN(TYPE_FIELD) + strlen (ci->ci_type)

                + strlen (ci->ci_subtype) + 3;
 
     extbody = ct->c_type == CT_MESSAGE && ct->c_subtype == MESSAGE_EXTERNAL;
                + strlen (ci->ci_subtype) + 3;
 
     extbody = ct->c_type == CT_MESSAGE && ct->c_subtype == MESSAGE_EXTERNAL;


@@ -1739,10 +1708,12 @@ build_headers (CT ct, int header_encoding)
     add_header (ct, np, vp);
 
     /*
     add_header (ct, np, vp);
 
     /*

-     * output the Content-ID, unless disabled by -nocontentid
+     * output the Content-ID, unless disabled by -nocontentid.  Note that
+     * RFC 2045 always requires a Content-ID header for message/external-body
+     * entities.

      */
      */

-    if (contentidsw && ct->c_id) {
-       np = add (ID_FIELD, NULL);
+    if ((contentidsw || ct->c_ctexbody) && ct->c_id) {
+       np = mh_xstrdup(ID_FIELD);

        vp = concat (" ", ct->c_id, NULL);
        add_header (ct, np, vp);
     }
        vp = concat (" ", ct->c_id, NULL);
        add_header (ct, np, vp);
     }


@@ -1750,7 +1721,7 @@ build_headers (CT ct, int header_encoding)
      * output the Content-Description
      */
     if (ct->c_descr) {
      * output the Content-Description
      */
     if (ct->c_descr) {

-       np = add (DESCR_FIELD, NULL);
+       np = mh_xstrdup(DESCR_FIELD);

        vp = concat (" ", ct->c_descr, NULL);
        if (header_encoding != CE_8BIT) {
            if (encode_rfc2047(DESCR_FIELD, &vp, header_encoding, NULL)) {
        vp = concat (" ", ct->c_descr, NULL);
        if (header_encoding != CE_8BIT) {
            if (encode_rfc2047(DESCR_FIELD, &vp, header_encoding, NULL)) {


@@ -1765,18 +1736,17 @@ build_headers (CT ct, int header_encoding)
      * set, then we need to build it.
      */
     if (ct->c_dispo) {
      * set, then we need to build it.
      */
     if (ct->c_dispo) {

-       np = add (DISPO_FIELD, NULL);
+       np = mh_xstrdup(DISPO_FIELD);

        vp = concat (" ", ct->c_dispo, NULL);
        add_header (ct, np, vp);
     } else if (ct->c_dispo_type) {
        vp = concat (" ", ct->c_dispo_type, NULL);
        vp = concat (" ", ct->c_dispo, NULL);
        add_header (ct, np, vp);
     } else if (ct->c_dispo_type) {
        vp = concat (" ", ct->c_dispo_type, NULL);

-       len = strlen(DISPO_FIELD) + strlen(vp) + 1;
+       len = LEN(DISPO_FIELD) + strlen(vp) + 1;

        np = output_params(len, ct->c_dispo_first, NULL, 0);
        vp = add(np, vp);
        vp = add("\n", vp);
        np = output_params(len, ct->c_dispo_first, NULL, 0);
        vp = add(np, vp);
        vp = add("\n", vp);

-       if (np)
-           free(np);
-       add_header (ct, getcpy(DISPO_FIELD), vp);
+        mh_xfree(np);
+       add_header (ct, mh_xstrdup(DISPO_FIELD), vp);

     }
 
 skip_headers:
     }
 
 skip_headers:


@@ -1792,21 +1762,26 @@ skip_headers:
      * output the Content-MD5
      */
     if (checksw) {
      * output the Content-MD5
      */
     if (checksw) {

-       np = add (MD5_FIELD, NULL);
-       vp = calculate_digest (ct, (ct->c_encoding == CE_QUOTED) ? 1 : 0);
+       np = mh_xstrdup(MD5_FIELD);
+        vp = calculate_digest (ct, ct->c_encoding == CE_QUOTED);

        add_header (ct, np, vp);
     }
 
     /*
      * output the Content-Transfer-Encoding
        add_header (ct, np, vp);
     }
 
     /*
      * output the Content-Transfer-Encoding

+     * If using EAI and message body is 7-bit, force 8-bit C-T-E.

      */
      */

+    if (header_encoding == CE_8BIT  &&  ct->c_encoding == CE_7BIT) {
+        ct->c_encoding = CE_8BIT;
+    }
+

     switch (ct->c_encoding) {
     case CE_7BIT:
        /* Nothing to output */
        break;
 
     case CE_8BIT:
     switch (ct->c_encoding) {
     case CE_7BIT:
        /* Nothing to output */
        break;
 
     case CE_8BIT:

-       np = add (ENCODING_FIELD, NULL);
+       np = mh_xstrdup(ENCODING_FIELD);

        vp = concat (" ", "8bit", "\n", NULL);
        add_header (ct, np, vp);
        break;
        vp = concat (" ", "8bit", "\n", NULL);
        add_header (ct, np, vp);
        break;


@@ -1815,7 +1790,7 @@ skip_headers:
        if (ct->c_type == CT_MESSAGE || ct->c_type == CT_MULTIPART)
            adios (NULL, "internal error, invalid encoding");
 
        if (ct->c_type == CT_MESSAGE || ct->c_type == CT_MULTIPART)
            adios (NULL, "internal error, invalid encoding");
 

-       np = add (ENCODING_FIELD, NULL);
+       np = mh_xstrdup(ENCODING_FIELD);

        vp = concat (" ", "quoted-printable", "\n", NULL);
        add_header (ct, np, vp);
        break;
        vp = concat (" ", "quoted-printable", "\n", NULL);
        add_header (ct, np, vp);
        break;


@@ -1824,7 +1799,7 @@ skip_headers:
        if (ct->c_type == CT_MESSAGE || ct->c_type == CT_MULTIPART)
            adios (NULL, "internal error, invalid encoding");
 
        if (ct->c_type == CT_MESSAGE || ct->c_type == CT_MULTIPART)
            adios (NULL, "internal error, invalid encoding");
 

-       np = add (ENCODING_FIELD, NULL);
+       np = mh_xstrdup(ENCODING_FIELD);

        vp = concat (" ", "base64", "\n", NULL);
        add_header (ct, np, vp);
        break;
        vp = concat (" ", "base64", "\n", NULL);
        add_header (ct, np, vp);
        break;


@@ -1833,7 +1808,7 @@ skip_headers:
        if (ct->c_type == CT_MESSAGE)
            adios (NULL, "internal error, invalid encoding");
 
        if (ct->c_type == CT_MESSAGE)
            adios (NULL, "internal error, invalid encoding");
 

-       np = add (ENCODING_FIELD, NULL);
+       np = mh_xstrdup(ENCODING_FIELD);

        vp = concat (" ", "binary", "\n", NULL);
        add_header (ct, np, vp);
        break;
        vp = concat (" ", "binary", "\n", NULL);
        add_header (ct, np, vp);
        break;


@@ -1938,7 +1913,7 @@ calculate_digest (CT ct, int asciiP)
        unsigned char *ep;
 
        fprintf (stderr, "MD5 digest=");
        unsigned char *ep;
 
        fprintf (stderr, "MD5 digest=");

-       for (ep = (dp = digest) + sizeof(digest) / sizeof(digest[0]);
+       for (ep = (dp = digest) + sizeof digest;

                 dp < ep; dp++)
            fprintf (stderr, "%02x", *dp & 0xff);
        fprintf (stderr, "\n");
                 dp < ep; dp++)
            fprintf (stderr, "%02x", *dp & 0xff);
        fprintf (stderr, "\n");


@@ -1946,7 +1921,7 @@ calculate_digest (CT ct, int asciiP)
 
     /* encode the digest using base64 */
     for (dp = digest, op = (char *) outbuf,
 
     /* encode the digest using base64 */
     for (dp = digest, op = (char *) outbuf,

-                               cc = sizeof(digest) / sizeof(digest[0]);
+                               cc = sizeof digest;

                cc > 0; cc -= 3, op += 4) {
        unsigned long bits;
        char *bp;
                cc > 0; cc -= 3, op += 4) {
        unsigned long bits;
        char *bp;


@@ -1993,7 +1968,7 @@ setup_attach_content(CT ct, char *filename)
 
     /*
      * Parse the Content-Type.  get_ctinfo() parses MIME parameters, but
 
     /*
      * Parse the Content-Type.  get_ctinfo() parses MIME parameters, but

-     * since we're just feeding it a MIME type we have to add those ourself.
+     * since we're just feeding it a MIME type we have to add those ourselves.

      * Map that to a valid content-type label and call any initialization
      * function.
      */
      * Map that to a valid content-type label and call any initialization
      * function.
      */


@@ -2025,7 +2000,7 @@ setup_attach_content(CT ct, char *filename)
        if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0)
            adios(NULL, "external-body messages must be specified "
                "by mhbuild directives");
        if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0)
            adios(NULL, "external-body messages must be specified "
                "by mhbuild directives");

-       /* Fall through */
+       /* FALLTHRU */

 
     default:
        /*
 
     default:
        /*


@@ -2043,9 +2018,8 @@ setup_attach_content(CT ct, char *filename)
 
     for (pm = ct->c_ctinfo.ci_first_pm; pm; pm = pm->pm_next) {
        if (strcasecmp(pm->pm_name, "name") == 0) {
 
     for (pm = ct->c_ctinfo.ci_first_pm; pm; pm = pm->pm_next) {
        if (strcasecmp(pm->pm_name, "name") == 0) {

-           if (pm->pm_value)
-               free(pm->pm_value);
-           pm->pm_value = getcpy(simplename);
+            mh_xfree(pm->pm_value);
+           pm->pm_value = mh_xstrdup(simplename);

            break;
        }
     }
            break;
        }
     }


@@ -2054,9 +2028,9 @@ setup_attach_content(CT ct, char *filename)
        add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm,
                  "name", simplename, 0);
 
        add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm,
                  "name", simplename, 0);
 

-    ct->c_descr = getcpy(simplename);
+    ct->c_descr = mh_xstrdup(simplename);

     ct->c_descr = add("\n", ct->c_descr);
     ct->c_descr = add("\n", ct->c_descr);

-    ct->c_cefile.ce_file = getcpy(filename);
+    ct->c_cefile.ce_file = mh_xstrdup(filename);

 
     set_disposition (ct);
 
 
     set_disposition (ct);
 


@@ -2078,22 +2052,24 @@ set_disposition (CT ct) {
 
         if (cp  &&  strcasecmp (cp, "attachment")  &&
             strcasecmp (cp, "inline")) {
 
         if (cp  &&  strcasecmp (cp, "attachment")  &&
             strcasecmp (cp, "inline")) {

-            admonish (NULL, "configuration problem: %s-disposition-%s%s%s "
-                      "specifies '%s' but only 'attachment' and 'inline' are "
-                      "allowed", invo_name,
-                      ct->c_ctinfo.ci_type,
-                      ct->c_ctinfo.ci_subtype ? "/" : "",
-                      ct->c_ctinfo.ci_subtype ? ct->c_ctinfo.ci_subtype : "",
-                      cp);
+            inform("configuration problem: %s-disposition-%s%s%s specifies "
+               "'%s' but only 'attachment' and 'inline' are allowed, "
+               "continuing...", invo_name,
+               ct->c_ctinfo.ci_type,
+               ct->c_ctinfo.ci_subtype ? "/" : "",
+               FENDNULL(ct->c_ctinfo.ci_subtype),
+               cp);

         }
 
         }
 

-        ct->c_dispo_type = cp  ?  getcpy (cp)  :  getcpy ("attachment");
+        if (!cp)
+            cp = "attachment";
+        ct->c_dispo_type = mh_xstrdup(cp);

     }
 }
 
 /*
  * Set text content charset if it was unspecified.  contains8bit
     }
 }
 
 /*
  * Set text content charset if it was unspecified.  contains8bit

- * selctions:
+ * selections:

  * 0: content does not contain 8-bit characters
  * 1: content contains 8-bit characters
  * -1: ignore content and use user's locale to determine charset
  * 0: content does not contain 8-bit characters
  * 1: content contains 8-bit characters
  * -1: ignore content and use user's locale to determine charset


@@ -2104,11 +2080,8 @@ set_charset (CT ct, int contains8bit) {
         struct text *t;
 
         if (ct->c_ctparams == NULL) {
         struct text *t;
 
         if (ct->c_ctparams == NULL) {

-            if ((t = ct->c_ctparams =
-                 (struct text *) mh_xcalloc (1, sizeof (struct text))) ==
-                NULL) {
-                adios (NULL, "out of memory");
-            }
+            NEW0(t);
+            ct->c_ctparams = t;

             t->tx_charset = CHARSET_UNSPECIFIED;
         } else {
             t = (struct text *) ct->c_ctparams;
             t->tx_charset = CHARSET_UNSPECIFIED;
         } else {
             t = (struct text *) ct->c_ctparams;


@@ -2227,7 +2200,6 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
     struct str2init *s2i;
     CT reply_ct;
     struct part *part;
     struct str2init *s2i;
     CT reply_ct;
     struct part *part;

-    int eightbit = 0;

     int status;
 
     type_p = getcpy (type);
     int status;
 
     type_p = getcpy (type);


@@ -2242,52 +2214,35 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
     free (type_p);
 
     if (! (convert)) {
     free (type_p);
 
     if (! (convert)) {

-        /* No mhbuild-convert- entry in mhn.defaults or profile
-           for type. */
+        /* No mhbuild-convert- entry in mhn.defaults or profile for type. */

         return;
     }
     /* reply_file is used to pass the output of the convert. */
     reply_file = getcpy (m_mktemp2 (NULL, invo_name, NULL, NULL));
     convert_command =
         return;
     }
     /* reply_file is used to pass the output of the convert. */
     reply_file = getcpy (m_mktemp2 (NULL, invo_name, NULL, NULL));
     convert_command =

-        concat (convert, " ", argstring ? argstring : "", " >", reply_file,
-                NULL);
+        concat (convert, " ", FENDNULL(argstring), " >", reply_file, NULL);

 
     /* Convert here . . . */
 
     /* Convert here . . . */

-    ct->c_storeproc = getcpy (convert_command);
+    ct->c_storeproc = mh_xstrdup(convert_command);

     ct->c_umask = ~m_gmprot ();
 
     if ((status = show_content_aux (ct, 0, convert_command, NULL, NULL)) !=
         OK) {
     ct->c_umask = ~m_gmprot ();
 
     if ((status = show_content_aux (ct, 0, convert_command, NULL, NULL)) !=
         OK) {

-        admonish (NULL, "store of %s content failed", type);
+        inform("store of %s content failed, continuing...", type);

     }
     free (convert_command);
 
     /* Fill out the the new ct, reply_ct. */
     }
     free (convert_command);
 
     /* Fill out the the new ct, reply_ct. */

-    reply_ct = (CT) mh_xcalloc (1, sizeof *reply_ct);
+    NEW0(reply_ct);

     init_decoded_content (reply_ct, infile);
 
     if (extract_headers (reply_ct, reply_file, &reply_fp) == NOTOK) {
         free (reply_file);
     init_decoded_content (reply_ct, infile);
 
     if (extract_headers (reply_ct, reply_file, &reply_fp) == NOTOK) {
         free (reply_file);

-        admonish (NULL,
-                  "failed to extract headers from convert output in %s",
-                  reply_file);
+        inform("failed to extract headers from convert output in %s, "
+           "continuing...", reply_file);

         return;
     }
 
         return;
     }
 

-    /* For text content only, see if it is 8-bit text. */
-    if (reply_ct->c_type == CT_TEXT) {
-        int fd;
-
-        if ((fd = open (reply_file, O_RDONLY)) == NOTOK  ||
-            scan_input (fd, &eightbit) == NOTOK) {
-            free (reply_file);
-            admonish (NULL, "failed to read %s", reply_file);
-            return;
-        } else {
-            (void) close (fd);
-        }
-    }
-

     /* This sets reply_ct->c_ctparams, and reply_ct->c_termproc if the
        charset can't be handled natively. */
     for (s2i = str2cts; s2i->si_key; s2i++) {
     /* This sets reply_ct->c_ctparams, and reply_ct->c_termproc if the
        charset can't be handled natively. */
     for (s2i = str2cts; s2i->si_key; s2i++) {


@@ -2300,39 +2255,22 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
         (*reply_ct->c_ctinitfnx)(reply_ct);
     }
 
         (*reply_ct->c_ctinitfnx)(reply_ct);
     }
 

-    if ((cp =
-         get_param (reply_ct->c_ctinfo.ci_first_pm, "charset", '?', 1))) {
+    if ((cp = get_param (reply_ct->c_ctinfo.ci_first_pm, "charset", '?', 1))) {

         /* The reply Content-Type had the charset. */
         charset = cp;
     } else {
         set_charset (reply_ct, -1);
         charset = get_param (reply_ct->c_ctinfo.ci_first_pm, "charset", '?', 1);
         /* The reply Content-Type had the charset. */
         charset = cp;
     } else {
         set_charset (reply_ct, -1);
         charset = get_param (reply_ct->c_ctinfo.ci_first_pm, "charset", '?', 1);

-        if (reply_ct->c_reqencoding == CE_UNKNOWN  &&
-            reply_ct->c_type == CT_TEXT) {
-            /* Assume that 8bit is sufficient (for text).  In other words,
-               don't allow it to be encoded as quoted printable if lines are
-               too long. */
-            reply_ct->c_reqencoding = eightbit  ?  CE_8BIT  :  CE_7BIT;
-        }

     }
 
     /* Concatenate text/plain parts. */
     }
 
     /* Concatenate text/plain parts. */

-    if (reply_ct->c_type == CT_TEXT  &&
-        reply_ct->c_subtype == TEXT_PLAIN) {
+    if (reply_ct->c_type == CT_TEXT  &&  reply_ct->c_subtype == TEXT_PLAIN) {

         if (! *text_plain_ct  &&  m->mp_parts  &&  m->mp_parts->mp_part  &&
             m->mp_parts->mp_part->c_type == CT_TEXT  &&
             m->mp_parts->mp_part->c_subtype == TEXT_PLAIN) {
             *text_plain_ct = m->mp_parts->mp_part;
         if (! *text_plain_ct  &&  m->mp_parts  &&  m->mp_parts->mp_part  &&
             m->mp_parts->mp_part->c_type == CT_TEXT  &&
             m->mp_parts->mp_part->c_subtype == TEXT_PLAIN) {
             *text_plain_ct = m->mp_parts->mp_part;

-            /* Make sure that the charset is set in the text/plain
-               part. */
+            /* Make sure that the charset is set in the text/plain part. */

             set_charset (*text_plain_ct, -1);
             set_charset (*text_plain_ct, -1);

-            if ((*text_plain_ct)->c_reqencoding == CE_UNKNOWN) {
-                /* Assume that 8bit is sufficient (for text).  In other words,
-                   don't allow it to be encoded as quoted printable if lines
-                   are too long. */
-                (*text_plain_ct)->c_reqencoding =
-                    eightbit  ?  CE_8BIT  :  CE_7BIT;
-            }

         }
 
         if (*text_plain_ct) {
         }
 
         if (*text_plain_ct) {


@@ -2386,7 +2324,7 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
     reply_ct->c_cefile.ce_unlink = 1;
 
     /* Attach the new part to the parent multipart/mixed, "m". */
     reply_ct->c_cefile.ce_unlink = 1;
 
     /* Attach the new part to the parent multipart/mixed, "m". */

-    part = (struct part *) mh_xcalloc (1, sizeof *part);
+    NEW0(part);

     part->mp_part = reply_ct;
     if (m->mp_parts) {
         struct part *p;
     part->mp_part = reply_ct;
     if (m->mp_parts) {
         struct part *p;


@@ -2423,8 +2361,8 @@ extract_headers (CT ct, char *reply_file, FILE **reply_fp) {
     buffer[statbuf.st_size] = '\0';
 
     /* Look for a header in the convert reply. */
     buffer[statbuf.st_size] = '\0';
 
     /* Look for a header in the convert reply. */

-    if (strncasecmp (buffer, TYPE_FIELD, strlen (TYPE_FIELD)) == 0  &&
-        buffer[strlen (TYPE_FIELD)] == ':') {
+    if (strncasecmp (buffer, TYPE_FIELD, LEN(TYPE_FIELD)) == 0  &&
+        buffer[LEN(TYPE_FIELD)] == ':') {

         if ((end_of_header = strstr (buffer, "\r\n\r\n"))) {
             end_of_header += 2;
             found_header = 1;
         if ((end_of_header = strstr (buffer, "\r\n\r\n"))) {
             end_of_header += 2;
             found_header = 1;


@@ -2438,28 +2376,29 @@ extract_headers (CT ct, char *reply_file, FILE **reply_fp) {
         CT tmp_ct;
         char *tmp_file;
         FILE *tmp_f;
         CT tmp_ct;
         char *tmp_file;
         FILE *tmp_f;

-        size_t n;
+        size_t n, written;

 
         /* Truncate buffer to just the C-T. */
         *end_of_header = '\0';
         n = strlen (buffer);
 
         if (get_ctinfo (buffer + 14, ct, 0) != OK) {
 
         /* Truncate buffer to just the C-T. */
         *end_of_header = '\0';
         n = strlen (buffer);
 
         if (get_ctinfo (buffer + 14, ct, 0) != OK) {

-            admonish (NULL, "unable to get content info for reply");
+            inform("unable to get content info for reply, continuing...");

             goto failed_to_extract_ct;
         }
 
         /* Hack.  Use parse_mime() to detect the type/subtype of the
            reply, which we'll use below. */
         tmp_file = getcpy (m_mktemp2 (NULL, invo_name, NULL, NULL));
             goto failed_to_extract_ct;
         }
 
         /* Hack.  Use parse_mime() to detect the type/subtype of the
            reply, which we'll use below. */
         tmp_file = getcpy (m_mktemp2 (NULL, invo_name, NULL, NULL));

-        if ((tmp_f = fopen (tmp_file, "w"))  &&
-            fwrite (buffer, 1, n, tmp_f) == n) {
-            fclose (tmp_f);
-        } else {
+        tmp_f = fopen(tmp_file, "w");
+        if (!tmp_f)
+            goto failed_to_extract_ct;
+        written = fwrite(buffer, 1, n, tmp_f);
+        fclose(tmp_f);
+        if (written != n)

             goto failed_to_extract_ct;
             goto failed_to_extract_ct;

-        }
-        tmp_ct = parse_mime (tmp_file);

 
 

+        tmp_ct = parse_mime (tmp_file);

         if (tmp_ct) {
             /* The type and subtype were detected from the reply
                using parse_mime() above. */
         if (tmp_ct) {
             /* The type and subtype were detected from the reply
                using parse_mime() above. */