Added ct_str_type() and ct_str_subtype() functions, to translate

[nmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index a344a7c7536d5fbbf896998411c96854fb5531c1..e046886f3e5a9e333016a8f75959e6fcb66366db 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -19,8 +19,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>

-#include <errno.h>
-#include <signal.h>

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


@@ -34,7 +32,6 @@
 
 
 extern int debugsw;
 
 
 extern int debugsw;

-extern int verbosw;

 
 extern int listsw;
 extern int rfc934sw;
 
 extern int listsw;
 extern int rfc934sw;


@@ -44,15 +41,18 @@ extern int contentidsw;
 extern int rcachesw;   /* mhcachesbr.c */
 extern int wcachesw;   /* mhcachesbr.c */
 
 extern int rcachesw;   /* mhcachesbr.c */
 extern int wcachesw;   /* mhcachesbr.c */
 

+static char prefix[] = "----- =_aaaaaaaaaa";
+
+struct attach_list {
+    char *filename;
+    struct attach_list *next;
+};
+

 /*
 /*

- * Directory to place tmp files.  This must
- * be set before these routines are called.
+ * Maximum size of URL token in message/external-body

  */
  */

-char *tmp;
-
-pid_t xpid = 0;

 
 

-static char prefix[] = "----- =_aaaaaaaaaa";
+#define MAXURLTOKEN 40

 
 
 /* mhmisc.c */
 
 
 /* mhmisc.c */


@@ -62,25 +62,20 @@ void content_error (char *, CT, char *, ...);
 int find_cache (CT, int, int *, char *, char *, int);
 
 /* mhfree.c */
 int find_cache (CT, int, int *, char *, char *, int);
 
 /* mhfree.c */

-void free_content (CT);

 void free_ctinfo (CT);
 void free_encoding (CT, int);
 
 void free_ctinfo (CT);
 void free_encoding (CT, int);
 

-/*
- * prototypes
- */
-CT build_mime (char *, int);
-

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

-static int init_decoded_content (CT);
+static int init_decoded_content (CT, const char *);
+static void setup_attach_content(CT, char *);

 static char *fgetstr (char *, int, FILE *);
 static char *fgetstr (char *, int, FILE *);

-static int user_content (FILE *, char *, char *, CT *);
+static int user_content (FILE *, char *, CT *, const char *infilename);

 static void set_id (CT, int);
 static void set_id (CT, int);

-static int compose_content (CT);
-static int scan_content (CT);
-static int build_headers (CT);
+static int compose_content (CT, int);
+static int scan_content (CT, size_t);
+static int build_headers (CT, int);

 static char *calculate_digest (CT, int);
 
 
 static char *calculate_digest (CT, int);
 
 


@@ -125,7 +120,8 @@ static void directive_pop(void)
  */
 
 CT
  */
 
 CT

-build_mime (char *infile, int directives)
+build_mime (char *infile, int autobuild, int dist, int directives,
+           int header_encoding, size_t maxunencoded, int verbose)

 {
     int        compnum, state;
     char buf[BUFSIZ], name[NAMESZ];
 {
     int        compnum, state;
     char buf[BUFSIZ], name[NAMESZ];


@@ -134,7 +130,9 @@ build_mime (char *infile, int directives)
     struct part **pp;
     CT ct;
     FILE *in;
     struct part **pp;
     CT ct;
     FILE *in;

+    HF hp;

     m_getfld_state_t gstate = 0;
     m_getfld_state_t gstate = 0;

+    struct attach_list *attach_head = NULL, *attach_tail = NULL, *at_entry;

 
     directive_init(directives);
 
 
     directive_init(directives);
 


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

-    if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL)
+    if ((ct = (CT) mh_xcalloc (1, sizeof(*ct))) == NULL)

        adios (NULL, "out of memory");
 
     /*
        adios (NULL, "out of memory");
 
     /*


@@ -155,7 +153,7 @@ build_mime (char *infile, int directives)
      * for this part.  We don't really need this, but
      * allocate it to remain consistent.
      */
      * for this part.  We don't really need this, but
      * allocate it to remain consistent.
      */

-    init_decoded_content (ct);
+    init_decoded_content (ct, infile);

 
     /*
      * Parse some of the header fields in the composition
 
     /*
      * Parse some of the header fields in the composition


@@ -170,16 +168,20 @@ build_mime (char *infile, int directives)
        case FLDPLUS:
            compnum++;
 
        case FLDPLUS:
            compnum++;
 

-           /* abort if draft has Mime-Version header field */
-           if (!mh_strcasecmp (name, VRSN_FIELD))
-               adios (NULL, "draft shouldn't contain %s: field", VRSN_FIELD);
-
-           /* abort if draft has Content-Transfer-Encoding header field */
-           if (!mh_strcasecmp (name, ENCODING_FIELD))
-               adios (NULL, "draft shouldn't contain %s: field", ENCODING_FIELD);
+           /* abort if draft has Mime-Version or C-T-E header field */
+           if (strcasecmp (name, VRSN_FIELD) == 0 ||
+               strcasecmp (name, ENCODING_FIELD) == 0) {
+               if (autobuild) {
+                   fclose(in);
+                   free (ct);
+                   return NULL;
+               } else {
+                   adios (NULL, "draft shouldn't contain %s: field", name);
+               }
+           }

 
            /* ignore any Content-Type fields in the header */
 
            /* ignore any Content-Type fields in the header */

-           if (!mh_strcasecmp (name, TYPE_FIELD)) {
+           if (!strcasecmp (name, TYPE_FIELD)) {

                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                    state = m_getfld (&gstate, name, buf, &bufsz, in);
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                    state = m_getfld (&gstate, name, buf, &bufsz, in);


@@ -198,19 +200,57 @@ build_mime (char *infile, int directives)
                vp = add (buf, vp);     /* add to previous value */
            }
 
                vp = add (buf, vp);     /* add to previous value */
            }
 

-           /* Now add the header data to the list */
-           add_header (ct, np, vp);
+           /*
+            * Now add the header data to the list, unless it's an attach
+            * header; in that case, add it to our attach list
+            */
+
+           if (strcasecmp(ATTACH_FIELD, np) == 0  ||
+               strcasecmp(ATTACH_FIELD_ALT, np) == 0) {
+               struct attach_list *entry;
+               char *s = vp, *e = vp + strlen(vp) - 1;
+               free(np);
+
+               /*
+                * Make sure we can find the start of this filename.
+                * If it's blank, we skip completely.  Otherwise, strip
+                * off any leading spaces and trailing newlines.
+                */
+
+               while (isspace((unsigned char) *s))
+                   s++;
+
+               while (e > s && *e == '\n')
+                   *e-- = '\0';
+
+               if (*s == '\0') {
+                   free(vp);
+                   goto finish_field;
+               }
+
+               entry = mh_xmalloc(sizeof(*entry));
+               entry->filename = getcpy(s);
+               entry->next = NULL;
+               free(vp);
+
+               if (attach_tail) {
+                   attach_tail->next = entry;
+                   attach_tail = entry;
+               } else {
+                   attach_head = attach_tail = entry;
+               }
+           } else {
+               add_header (ct, np, vp);
+           }

 
 finish_field:
            /* if this wasn't the last header field, then continue */
            continue;
 
 
 finish_field:
            /* if this wasn't the last header field, then continue */
            continue;
 

-       case FILEEOF:
-           adios (NULL, "draft has empty body -- no directives!");
-           /* NOTREACHED */
-

        case BODY:
            fseek (in, (long) (-strlen (buf)), SEEK_CUR);
        case BODY:
            fseek (in, (long) (-strlen (buf)), SEEK_CUR);

+           /* fall through */
+       case FILEEOF:

            break;
 
        case LENERR:
            break;
 
        case LENERR:


@@ -224,13 +264,27 @@ finish_field:
     }
     m_getfld_state_destroy (&gstate);
 
     }
     m_getfld_state_destroy (&gstate);
 

+    /*
+     * Iterate through the list of headers and call the function to MIME-ify
+     * them if required.
+     */
+
+    for (hp = ct->c_first_hf; hp != NULL; hp = hp->next) {
+       if (encode_rfc2047(hp->name, &hp->value, header_encoding, NULL)) {
+           adios(NULL, "Unable to encode header \"%s\"", hp->name);
+       }
+    }
+

     /*
      * Now add the MIME-Version header field
      * to the list of header fields.
      */
     /*
      * Now add the MIME-Version header field
      * to the list of header fields.
      */

-    np = add (VRSN_FIELD, NULL);
-    vp = concat (" ", VRSN_VALUE, "\n", NULL);
-    add_header (ct, np, vp);
+
+    if (! dist) {
+       np = add (VRSN_FIELD, NULL);
+       vp = concat (" ", VRSN_VALUE, "\n", NULL);
+       add_header (ct, np, vp);
+    }

 
     /*
      * We initally assume we will find multiple contents in the
 
     /*
      * We initally assume we will find multiple contents in the


@@ -241,9 +295,8 @@ finish_field:
        done (1);
     ct->c_type = CT_MULTIPART;
     ct->c_subtype = MULTI_MIXED;
        done (1);
     ct->c_type = CT_MULTIPART;
     ct->c_subtype = MULTI_MIXED;

-    ct->c_file = add (infile, NULL);

 
 

-    if ((m = (struct multipart *) calloc (1, sizeof(*m))) == NULL)
+    if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)

        adios (NULL, "out of memory");
     ct->c_ctparams = (void *) m;
     pp = &m->mp_parts;
        adios (NULL, "out of memory");
     ct->c_ctparams = (void *) m;
     pp = &m->mp_parts;


@@ -256,18 +309,98 @@ finish_field:
        struct part *part;
        CT p;
 
        struct part *part;
        CT p;
 

-       if (user_content (in, infile, buf, &p) == DONE) {
+       if (user_content (in, buf, &p, infile) == DONE) {

            admonish (NULL, "ignoring spurious #end");
            continue;
        }
        if (!p)
            continue;
 
            admonish (NULL, "ignoring spurious #end");
            continue;
        }
        if (!p)
            continue;
 

-       if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+       if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
+           adios (NULL, "out of memory");
+       *pp = part;
+       pp = &part->mp_next;
+       part->mp_part = p;
+    }
+
+    /*
+     * Add any Attach headers to the list of MIME parts at the end of the
+     * message.
+     */
+
+    for (at_entry = attach_head; at_entry; ) {
+       struct attach_list *at_prev = at_entry;
+       struct part *part;
+       CT p;
+
+       if (access(at_entry->filename, R_OK) != 0) {
+           adios("reading", "Unable to open %s for", at_entry->filename);
+       }
+
+       if ((p = (CT) mh_xcalloc (1, sizeof(*p))) == NULL)
+           adios(NULL, "out of memory");
+
+       init_decoded_content(p, infile);
+
+       /*
+        * Initialize our content structure based on the filename,
+        * and fill in all of the relevant fields.  Also place MIME
+        * parameters in the attributes array.
+        */
+
+       setup_attach_content(p, at_entry->filename);
+
+       if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)

            adios (NULL, "out of memory");
        *pp = part;
        pp = &part->mp_next;
        part->mp_part = p;
            adios (NULL, "out of memory");
        *pp = part;
        pp = &part->mp_next;
        part->mp_part = p;

+
+       at_entry = at_entry->next;
+       free(at_prev->filename);
+       free(at_prev);
+    }
+
+    /*
+     * To allow for empty message bodies, if we've found NO content at all
+     * yet cook up an empty text/plain part.
+     */
+
+    if (!m->mp_parts) {
+       CT p;
+       struct part *part;
+       struct text *t;
+
+       if ((p = (CT) mh_xcalloc (1, sizeof(*p))) == NULL)
+           adios(NULL, "out of memory");
+
+       init_decoded_content(p, infile);
+
+       if (get_ctinfo ("text/plain", p, 0) == NOTOK)
+           done (1);
+
+       p->c_type = CT_TEXT;
+       p->c_subtype = TEXT_PLAIN;
+       p->c_encoding = CE_7BIT;
+       /*
+        * Sigh.  ce_file contains the "decoded" contents of this part.
+        * 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_begin = ftell(in);
+       p->c_end = ftell(in);
+
+       if ((t = (struct text *) mh_xcalloc (1, sizeof (*t))) == NULL)
+           adios (NULL, "out of memory");
+
+       t->tx_charset = CHARSET_SPECIFIED;
+       p->c_ctparams = t;
+
+       if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
+           adios (NULL, "out of memory");
+       *pp = part;
+       part->mp_part = p;

     }
 
     /*
     }
 
     /*


@@ -276,10 +409,6 @@ finish_field:
      */
     fclose (in);
 
      */
     fclose (in);
 

-    /* check if any contents were found */
-    if (!m->mp_parts)
-       adios (NULL, "no content directives found");
-

     /*
      * If only one content was found, then remove and
      * free the outer multipart content.
     /*
      * If only one content was found, then remove and
      * free the outer multipart content.


@@ -306,7 +435,7 @@ finish_field:
      * Fill out, or expand directives.  Parse and execute
      * commands specified by profile composition strings.
      */
      * Fill out, or expand directives.  Parse and execute
      * commands specified by profile composition strings.
      */

-    compose_content (ct);
+    compose_content (ct, verbose);

 
     if ((cp = strchr(prefix, 'a')) == NULL)
        adios (NULL, "internal error(4)");
 
     if ((cp = strchr(prefix, 'a')) == NULL)
        adios (NULL, "internal error(4)");


@@ -316,19 +445,20 @@ finish_field:
      * check if prefix for multipart boundary clashes with
      * any of the contents.
      */
      * check if prefix for multipart boundary clashes with
      * any of the contents.
      */

-    while (scan_content (ct) == NOTOK) {
+    while (scan_content (ct, maxunencoded) == NOTOK) {

        if (*cp < 'z') {
            (*cp)++;
         } else {
            if (*++cp == 0)
                adios (NULL, "giving up trying to find a unique delimiter string");
        if (*cp < 'z') {
            (*cp)++;
         } else {
            if (*++cp == 0)
                adios (NULL, "giving up trying to find a unique delimiter string");

-           else
+           else

                (*cp)++;
        }
     }
 
     /* Build the rest of the header field structures */
                (*cp)++;
        }
     }
 
     /* Build the rest of the header field structures */

-    build_headers (ct);
+    if (! dist)
+       build_headers (ct, header_encoding);

 
     return ct;
 }
 
     return ct;
 }


@@ -340,17 +470,13 @@ finish_field:
  */
 
 static int
  */
 
 static int

-init_decoded_content (CT ct)
+init_decoded_content (CT ct, const char *filename)

 {
 {

-    CE ce;
-
-    if ((ce = (CE) calloc (1, sizeof(*ce))) == NULL)
-       adios (NULL, "out of memory");
-
-    ct->c_cefile     = ce;

     ct->c_ceopenfnx  = open7Bit;       /* since unencoded */
     ct->c_ceclosefnx = close_encoding;
     ct->c_cesizefnx  = NULL;           /* since unencoded */
     ct->c_ceopenfnx  = open7Bit;       /* since unencoded */
     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);

 
     return OK;
 }
 
     return OK;
 }


@@ -400,11 +526,10 @@ fgetstr (char *s, int n, FILE *stream)
  */
 
 static int
  */
 
 static int

-user_content (FILE *in, char *file, char *buf, CT *ctp)
+user_content (FILE *in, char *buf, CT *ctp, const char *infilename)

 {
     int        extrnal, vrsn;
 {
     int        extrnal, vrsn;

-    unsigned char *cp;
-    char **ap;
+    char *cp, **ap;

     char buffer[BUFSIZ];
     struct multipart *m;
     struct part **pp;
     char buffer[BUFSIZ];
     struct multipart *m;
     struct part **pp;


@@ -420,13 +545,13 @@ user_content (FILE *in, char *file, char *buf, CT *ctp)
     }
 
     /* allocate basic Content structure */
     }
 
     /* allocate basic Content structure */

-    if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL)
+    if ((ct = (CT) mh_xcalloc (1, sizeof(*ct))) == NULL)

        adios (NULL, "out of memory");
     *ctp = ct;
 
     /* allocate basic structure for handling decoded content */
        adios (NULL, "out of memory");
     *ctp = ct;
 
     /* allocate basic structure for handling decoded content */

-    init_decoded_content (ct);
-    ce = ct->c_cefile;
+    init_decoded_content (ct, infilename);
+    ce = &ct->c_cefile;

 
     ci = &ct->c_ctinfo;
     set_id (ct, 0);
 
     ci = &ct->c_ctinfo;
     set_id (ct, 0);


@@ -447,8 +572,10 @@ user_content (FILE *in, char *file, char *buf, CT *ctp)
        FILE *out;
         char *cp;
 
        FILE *out;
         char *cp;
 

-        cp = m_mktemp2(NULL, invo_name, NULL, &out);
-        if (cp == NULL) adios("mhbuildsbr", "unable to create temporary file");
+       if ((cp = m_mktemp2(NULL, invo_name, NULL, &out)) == NULL) {
+           adios("mhbuildsbr", "unable to create temporary file in %s",
+                 get_temp_dir());
+       }

 
        /* use a temp file to collect the plain text lines */
        ce->ce_file = add (cp, NULL);
 
        /* use a temp file to collect the plain text lines */
        ce->ce_file = add (cp, NULL);


@@ -543,7 +670,7 @@ rock_and_roll:
            done (1);
 
        for (s2i = str2cts; s2i->si_key; s2i++)
            done (1);
 
        for (s2i = str2cts; s2i->si_key; s2i++)

-           if (!mh_strcasecmp (ci->ci_type, s2i->si_key))
+           if (!strcasecmp (ci->ci_type, s2i->si_key))

                break;
        if (!s2i->si_key && !uprf (ci->ci_type, "X-"))
            s2i++;
                break;
        if (!s2i->si_key && !uprf (ci->ci_type, "X-"))
            s2i++;


@@ -553,7 +680,7 @@ rock_and_roll:
         */
        switch (ct->c_type = s2i->si_val) {
        case CT_MESSAGE:
         */
        switch (ct->c_type = s2i->si_val) {
        case CT_MESSAGE:

-           if (!mh_strcasecmp (ci->ci_subtype, "rfc822")) {
+           if (!strcasecmp (ci->ci_subtype, "rfc822")) {

                ct->c_encoding = CE_7BIT;
                goto call_init;
            }
                ct->c_encoding = CE_7BIT;
                goto call_init;
            }


@@ -589,7 +716,7 @@ call_init:
 
     /* check directive against the list of MIME types */
     for (s2i = str2cts; s2i->si_key; s2i++)
 
     /* check directive against the list of MIME types */
     for (s2i = str2cts; s2i->si_key; s2i++)

-       if (!mh_strcasecmp (ci->ci_type, s2i->si_key))
+       if (!strcasecmp (ci->ci_type, s2i->si_key))

            break;
 
     /*
            break;
 
     /*


@@ -610,10 +737,10 @@ call_init:
            /* NOTREACHED */
 
        case CT_MESSAGE:
            /* NOTREACHED */
 
        case CT_MESSAGE:

-           if (!mh_strcasecmp (ci->ci_subtype, "partial"))
+           if (!strcasecmp (ci->ci_subtype, "partial"))

                adios (NULL, "sorry, \"#%s/%s\" isn't supported",
                       ci->ci_type, ci->ci_subtype);
                adios (NULL, "sorry, \"#%s/%s\" isn't supported",
                       ci->ci_type, ci->ci_subtype);

-           if (!mh_strcasecmp (ci->ci_subtype, "external-body"))
+           if (!strcasecmp (ci->ci_subtype, "external-body"))

                adios (NULL, "use \"#@type/subtype ... [] ...\" instead of \"#%s/%s\"",
                       ci->ci_type, ci->ci_subtype);
 use_forw:
                adios (NULL, "use \"#@type/subtype ... [] ...\" instead of \"#%s/%s\"",
                       ci->ci_type, ci->ci_subtype);
 use_forw:


@@ -650,16 +777,16 @@ 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) calloc (1, sizeof(*ct))) == NULL)
+           if ((ct = (CT) mh_xcalloc (1, sizeof(*ct))) == NULL)

                adios (NULL, "out of memory");
                adios (NULL, "out of memory");

+           init_decoded_content(ct, infilename);

            *ctp = ct;
            *ctp = ct;

-           ci = &ct->c_ctinfo;

            if (get_ctinfo (buffer, ct, 0) == NOTOK)
                done (1);
            ct->c_type = CT_MESSAGE;
            ct->c_subtype = MESSAGE_EXTERNAL;
 
            if (get_ctinfo (buffer, ct, 0) == NOTOK)
                done (1);
            ct->c_type = CT_MESSAGE;
            ct->c_subtype = MESSAGE_EXTERNAL;
 

-           if ((e = (struct exbody *) calloc (1, sizeof(*e))) == NULL)
+           if ((e = (struct exbody *) mh_xcalloc (1, sizeof(*e))) == NULL)

                adios (NULL, "out of memory");
            ct->c_ctparams = (void *) e;
 
                adios (NULL, "out of memory");
            ct->c_ctparams = (void *) e;
 


@@ -677,7 +804,7 @@ use_forw:
        if (ci->ci_magic) {
            /* check if specifies command to execute */
            if (*ci->ci_magic == '|' || *ci->ci_magic == '!') {
        if (ci->ci_magic) {
            /* check if specifies command to execute */
            if (*ci->ci_magic == '|' || *ci->ci_magic == '!') {

-               for (cp = ci->ci_magic + 1; isspace (*cp); cp++)
+               for (cp = ci->ci_magic + 1; isspace ((unsigned char) *cp); cp++)

                    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);


@@ -700,14 +827,10 @@ use_forw:
         * No [file] argument, so check profile for
         * method to compose content.
         */
         * No [file] argument, so check profile for
         * method to compose content.
         */

-       snprintf (buffer, sizeof(buffer), "%s-compose-%s/%s",
-               invo_name, ci->ci_type, ci->ci_subtype);
-       if ((cp = context_find (buffer)) == NULL || *cp == '\0') {
-           snprintf (buffer, sizeof(buffer), "%s-compose-%s", invo_name, ci->ci_type);
-           if ((cp = context_find (buffer)) == NULL || *cp == '\0') {
-               content_error (NULL, ct, "don't know how to compose content");
-               done (1);
-           }
+       cp = context_find_by_type ("compose", ci->ci_type, ci->ci_subtype);
+       if (cp == NULL) {
+           content_error (NULL, ct, "don't know how to compose content");
+           done (1);

        }
        ci->ci_magic = add (cp, NULL);
        return OK;
        }
        ci->ci_magic = add (cp, NULL);
        return OK;


@@ -720,7 +843,7 @@ use_forw:
      * Message directive
      * #forw [+folder] [msgs]
      */
      * Message directive
      * #forw [+folder] [msgs]
      */

-    if (!mh_strcasecmp (ci->ci_type, "forw")) {
+    if (!strcasecmp (ci->ci_type, "forw")) {

        int msgnum;
        char *folder, *arguments[MAXARGS];
        struct msgs *mp;
        int msgnum;
        char *folder, *arguments[MAXARGS];
        struct msgs *mp;


@@ -749,7 +872,7 @@ use_forw:
        if (!folder)
            folder = add (getfolder (1), NULL);
 
        if (!folder)
            folder = add (getfolder (1), NULL);
 

-       if (!(mp = folder_read (folder)))
+       if (!(mp = folder_read (folder, 0)))

            adios (NULL, "unable to read folder %s", folder);
        for (ap = arguments; *ap; ap++) {
            cp = *ap;
            adios (NULL, "unable to read folder %s", folder);
        for (ap = arguments; *ap; ap++) {
            cp = *ap;


@@ -773,7 +896,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 *) calloc (1, sizeof(*m))) == NULL)
+           if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)

                adios (NULL, "out of memory");
            ct->c_ctparams = (void *) m;
            pp = &m->mp_parts;
                adios (NULL, "out of memory");
            ct->c_ctparams = (void *) m;
            pp = &m->mp_parts;


@@ -784,10 +907,10 @@ use_forw:
                    CT p;
                    CE pe;
 
                    CT p;
                    CE pe;
 

-                   if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
+                   if ((p = (CT) mh_xcalloc (1, sizeof(*p))) == NULL)

                        adios (NULL, "out of memory");
                        adios (NULL, "out of memory");

-                   init_decoded_content (p);
-                   pe = p->c_cefile;
+                   init_decoded_content (p, infilename);
+                   pe = &p->c_cefile;

                    if (get_ctinfo ("message/rfc822", p, 0) == NOTOK)
                        done (1);
                    p->c_type = CT_MESSAGE;
                    if (get_ctinfo ("message/rfc822", p, 0) == NOTOK)
                        done (1);
                    p->c_type = CT_MESSAGE;


@@ -798,7 +921,7 @@ use_forw:
                    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 *) calloc (1, sizeof(*part))) == NULL)
+                   if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)

                        adios (NULL, "out of memory");
                    *pp = part;
                    pp = &part->mp_next;
                        adios (NULL, "out of memory");
                    *pp = part;
                    pp = &part->mp_next;


@@ -826,7 +949,7 @@ use_forw:
     /*
      * #end
      */
     /*
      * #end
      */

-    if (!mh_strcasecmp (ci->ci_type, "end")) {
+    if (!strcasecmp (ci->ci_type, "end")) {

        free_content (ct);
        *ctp = NULL;
        return DONE;
        free_content (ct);
        *ctp = NULL;
        return DONE;


@@ -835,14 +958,14 @@ use_forw:
     /*
      * #begin [ alternative | parallel ]
      */
     /*
      * #begin [ alternative | parallel ]
      */

-    if (!mh_strcasecmp (ci->ci_type, "begin")) {
+    if (!strcasecmp (ci->ci_type, "begin")) {

        if (!ci->ci_magic) {
            vrsn = MULTI_MIXED;
            cp = SubMultiPart[vrsn - 1].kv_key;
        if (!ci->ci_magic) {
            vrsn = MULTI_MIXED;
            cp = SubMultiPart[vrsn - 1].kv_key;

-       } else if (!mh_strcasecmp (ci->ci_magic, "alternative")) {
+       } else if (!strcasecmp (ci->ci_magic, "alternative")) {

            vrsn = MULTI_ALTERNATE;
            cp = SubMultiPart[vrsn - 1].kv_key;
            vrsn = MULTI_ALTERNATE;
            cp = SubMultiPart[vrsn - 1].kv_key;

-       } else if (!mh_strcasecmp (ci->ci_magic, "parallel")) {
+       } else if (!strcasecmp (ci->ci_magic, "parallel")) {

            vrsn = MULTI_PARALLEL;
            cp = SubMultiPart[vrsn - 1].kv_key;
        } else if (uprf (ci->ci_magic, "digest")) {
            vrsn = MULTI_PARALLEL;
            cp = SubMultiPart[vrsn - 1].kv_key;
        } else if (uprf (ci->ci_magic, "digest")) {


@@ -859,7 +982,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 *) calloc (1, sizeof(*m))) == NULL)
+       if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)

            adios (NULL, "out of memory");
        ct->c_ctparams = (void *) m;
 
            adios (NULL, "out of memory");
        ct->c_ctparams = (void *) m;
 


@@ -868,7 +991,7 @@ use_forw:
            struct part *part;
            CT p;
 
            struct part *part;
            CT p;
 

-           if (user_content (in, file, buffer, &p) == DONE) {
+           if (user_content (in, buffer, &p, infilename) == DONE) {

                if (!m->mp_parts)
                    adios (NULL, "empty \"#begin ... #end\" sequence");
                return OK;
                if (!m->mp_parts)
                    adios (NULL, "empty \"#begin ... #end\" sequence");
                return OK;


@@ -876,7 +999,7 @@ use_forw:
            if (!p)
                continue;
 
            if (!p)
                continue;
 

-           if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+           if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)

                adios (NULL, "out of memory");
            *pp = part;
            pp = &part->mp_next;
                adios (NULL, "out of memory");
            *pp = part;
            pp = &part->mp_next;


@@ -920,9 +1043,9 @@ set_id (CT ct, int top)
  */
 
 static int
  */
 
 static int

-compose_content (CT ct)
+compose_content (CT ct, int verbose)

 {
 {

-    CE ce = ct->c_cefile;
+    CE ce = &ct->c_cefile;

 
     switch (ct->c_type) {
     case CT_MULTIPART:
 
     switch (ct->c_type) {
     case CT_MULTIPART:


@@ -946,7 +1069,7 @@ compose_content (CT ct)
 
            sprintf (pp, "%d", partnum);
            p->c_partno = add (partnam, NULL);
 
            sprintf (pp, "%d", partnum);
            p->c_partno = add (partnam, NULL);

-           if (compose_content (p) == NOTOK)
+           if (compose_content (p, verbose) == NOTOK)

                return NOTOK;
        }
 
                return NOTOK;
        }
 


@@ -998,7 +1121,7 @@ compose_content (CT ct)
        if (!ce->ce_file) {
            pid_t child_id;
            int i, xstdout, len, buflen;
        if (!ce->ce_file) {
            pid_t child_id;
            int i, xstdout, len, buflen;

-           char *bp, **ap, *cp;
+           char *bp, *cp;

            char *vec[4], buffer[BUFSIZ];
            FILE *out;
            CI ci = &ct->c_ctinfo;
            char *vec[4], buffer[BUFSIZ];
            FILE *out;
            CI ci = &ct->c_ctinfo;


@@ -1007,10 +1130,10 @@ compose_content (CT ct)
            if (!(cp = ci->ci_magic))
                adios (NULL, "internal error(5)");
 
            if (!(cp = ci->ci_magic))
                adios (NULL, "internal error(5)");
 

-            tfile = m_mktemp2(NULL, invo_name, NULL, NULL);
-            if (tfile == NULL) {
-                adios("mhbuildsbr", "unable to create temporary file");
-            }
+           if ((tfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+               adios("mhbuildsbr", "unable to create temporary file in %s",
+                     get_temp_dir());
+           }

            ce->ce_file = add (tfile, NULL);
            ce->ce_unlink = 1;
 
            ce->ce_file = add (tfile, NULL);
            ce->ce_unlink = 1;
 


@@ -1030,11 +1153,12 @@ compose_content (CT ct)
                    case 'a':
                    {
                        /* insert parameters from directive */
                    case 'a':
                    {
                        /* insert parameters from directive */

-                       char **ep;

                        char *s = "";
                        char *s = "";

+                       PM pm;

 
 

-                       for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
-                           snprintf (bp, buflen, "%s%s=\"%s\"", s, *ap, *ep);
+                       for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
+                           snprintf (bp, buflen, "%s%s=\"%s\"", s,
+                                   pm->pm_name, get_param_value(pm, '?'));

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


@@ -1082,7 +1206,7 @@ raw:
                }
            }
 
                }
            }
 

-           if (verbosw)
+           if (verbose)

                printf ("composing content %s/%s from command\n\t%s\n",
                        ci->ci_type, ci->ci_subtype, buffer);
 
                printf ("composing content %s/%s from command\n\t%s\n",
                        ci->ci_type, ci->ci_subtype, buffer);
 


@@ -1096,7 +1220,7 @@ raw:
            if ((out = fopen (ce->ce_file, "w")) == NULL)
                adios (ce->ce_file, "unable to open for writing");
 
            if ((out = fopen (ce->ce_file, "w")) == NULL)
                adios (ce->ce_file, "unable to open for writing");
 

-           for (i = 0; (child_id = vfork()) == NOTOK && i > 5; i++)
+           for (i = 0; (child_id = fork()) == NOTOK && i > 5; i++)

                sleep (5);
            switch (child_id) {
            case NOTOK:
                sleep (5);
            switch (child_id) {
            case NOTOK:


@@ -1149,17 +1273,22 @@ raw:
  */
 
 static int
  */
 
 static int

-scan_content (CT ct)
+scan_content (CT ct, size_t maxunencoded)

 {
 {

-    int len;
-    int check8bit = 0, contains8bit = 0;  /* check if contains 8bit data                */
-    int checklinelen = 0, linelen = 0;   /* check for long lines                       */
+    int prefix_len;
+    int check8bit = 0, contains8bit = 0;  /* check if contains 8bit data */
+    int checknul = 0, containsnul = 0;  /* check if contains NULs */
+    int checklinelen = 0, linelen = 0;  /* check for long lines */
+    int checkllinelen = 0; /* check for extra-long lines */

     int checkboundary = 0, boundaryclash = 0; /* check if clashes with multipart boundary   */
     int checklinespace = 0, linespace = 0;  /* check if any line ends with space          */
     int checkboundary = 0, boundaryclash = 0; /* check if clashes with multipart boundary   */
     int checklinespace = 0, linespace = 0;  /* check if any line ends with space          */

-    unsigned char *cp = NULL, buffer[BUFSIZ];
+    char *cp = NULL;
+    char *bufp = NULL;
+    size_t buflen;
+    ssize_t gotlen;

     struct text *t = NULL;
     FILE *in = NULL;
     struct text *t = NULL;
     FILE *in = NULL;

-    CE ce = ct->c_cefile;
+    CE ce = &ct->c_cefile;

 
     /*
      * handle multipart by scanning all subparts
 
     /*
      * handle multipart by scanning all subparts


@@ -1175,7 +1304,7 @@ scan_content (CT ct)
        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 (scan_content (p) == NOTOK)      /* choose encoding for subpart */
+           if (scan_content (p, maxunencoded) == NOTOK)        /* choose encoding for subpart */

                return NOTOK;
 
            /* if necessary, enlarge encoding for enclosing multipart */
                return NOTOK;
 
            /* if necessary, enlarge encoding for enclosing multipart */


@@ -1189,87 +1318,131 @@ scan_content (CT ct)
     }
 
     /*
     }
 
     /*

-     * Decide what to check while scanning this content.
+     * Decide what to check while scanning this content.  Note that
+     * for text content we always check for 8bit characters if the
+     * charset is unspecified, because that controls whether or not the
+     * character set is us-ascii or retrieved from the locale.

      */
      */

-    switch (ct->c_type) {
-    case CT_TEXT:
-       check8bit = 1;
-       checkboundary = 1;
-       if (ct->c_subtype == TEXT_PLAIN) {
-           checklinelen = 0;
-           checklinespace = 0;
-       } else {
-           checklinelen = 1;
-           checklinespace = 1;
+
+    if (ct->c_type == CT_TEXT) {
+       t = (struct text *) ct->c_ctparams;
+       if (t->tx_charset == CHARSET_UNSPECIFIED) {
+           check8bit = 1;
+           checknul = 1;

        }
        }

-       break;
+    }

 
 

-    case CT_APPLICATION:
-       check8bit = 1;
-       checklinelen = 1;
-       checklinespace = 1;
+    switch (ct->c_reqencoding) {
+    case CE_8BIT:
+       checkllinelen = 1;

        checkboundary = 1;
        break;
        checkboundary = 1;
        break;

-
-    case CT_MESSAGE:
-       check8bit = 0;
-       checklinelen = 0;
-       checklinespace = 0;
-
-       /* don't check anything for message/external */
-       if (ct->c_subtype == MESSAGE_EXTERNAL)
-           checkboundary = 0;
-       else
+    case CE_QUOTED:
+       checkboundary = 1;
+       break;
+    case CE_BASE64:
+       break;
+    case CE_UNKNOWN:
+       /* Use the default rules based on content-type */
+       switch (ct->c_type) {
+       case CT_TEXT:

            checkboundary = 1;
            checkboundary = 1;

+           checklinelen = 1;
+           if (ct->c_subtype == TEXT_PLAIN) {
+               checklinespace = 0;
+           } else {
+               checklinespace = 1;
+           }

        break;
 
        break;
 

-    case CT_AUDIO:
-    case CT_IMAGE:
-    case CT_VIDEO:
-       /*
-        * Don't check anything for these types,
-        * since we are forcing use of base64.
-        */
-       check8bit = 0;
-       checklinelen = 0;
-       checklinespace = 0;
-       checkboundary = 0;
+       case CT_APPLICATION:
+           check8bit = 1;
+           checknul = 1;
+           checklinelen = 1;
+           checklinespace = 1;
+           checkboundary = 1;

        break;
        break;

+
+       case CT_MESSAGE:
+           checklinelen = 0;
+           checklinespace = 0;
+
+           /* don't check anything for message/external */
+           if (ct->c_subtype == MESSAGE_EXTERNAL) {
+               checkboundary = 0;
+               check8bit = 0;
+           } else {
+               checkboundary = 1;
+               check8bit = 1;
+           }
+           break;
+
+       case CT_AUDIO:
+       case CT_IMAGE:
+       case CT_VIDEO:
+           /*
+            * Don't check anything for these types,
+            * since we are forcing use of base64, unless
+            * the content-type was specified by a mhbuild directive.
+            */
+           check8bit = 0;
+           checklinelen = 0;
+           checklinespace = 0;
+           checkboundary = 0;
+           break;
+       }

     }
 
     /*
      * Scan the unencoded content
      */
     }
 
     /*
      * Scan the unencoded content
      */

-    if (check8bit || checklinelen || checklinespace || checkboundary) {
+    if (check8bit || checklinelen || checklinespace || checkboundary ||
+       checkllinelen || checknul) {

        if ((in = fopen (ce->ce_file, "r")) == NULL)
            adios (ce->ce_file, "unable to open for reading");
        if ((in = fopen (ce->ce_file, "r")) == NULL)
            adios (ce->ce_file, "unable to open for reading");

-       len = strlen (prefix);
+       prefix_len = strlen (prefix);

 
 

-       while (fgets (buffer, sizeof(buffer) - 1, in)) {
+       while ((gotlen = getline(&bufp, &buflen, in)) != -1) {

            /*
            /*

-            * Check for 8bit data.
+            * Check for 8bit and NUL data.

             */
             */

-           if (check8bit) {
-               for (cp = buffer; *cp; cp++) {
-                   if (!isascii (*cp)) {
-                       contains8bit = 1;
-                       check8bit = 0;  /* no need to keep checking */
-                   }
+           for (cp = bufp; (check8bit || checknul) &&
+                                       cp < bufp + gotlen; cp++) {
+               if (!isascii ((unsigned char) *cp)) {
+                   contains8bit = 1;
+                   check8bit = 0;      /* no need to keep checking */
+               }
+               if (!*cp) {
+                   containsnul = 1;
+                   checknul = 0;       /* no need to keep checking */

                }
            }
 
            /*
             * Check line length.
             */
                }
            }
 
            /*
             * Check line length.
             */

-           if (checklinelen && (strlen (buffer) > CPERLIN + 1)) {
+           if (checklinelen && ((size_t)gotlen > maxunencoded + 1)) {

                linelen = 1;
                checklinelen = 0;       /* no need to keep checking */
            }
 
                linelen = 1;
                checklinelen = 0;       /* no need to keep checking */
            }
 

+           /*
+            * RFC 5322 specifies that a message cannot contain a line
+            * greater than 998 characters (excluding the CRLF).  If we
+            * get one of those lines and linelen is NOT set, then abort.
+            */
+
+           if (checkllinelen && !linelen &&
+                                       (gotlen > MAXLONGLINE + 1)) {
+               adios(NULL, "Line in content exceeds maximum line limit (%d)",
+                     MAXLONGLINE);
+           }
+

            /*
             * Check if line ends with a space.
             */
            /*
             * Check if line ends with a space.
             */

-           if (checklinespace && (cp = buffer + strlen (buffer) - 2) > buffer && isspace (*cp)) {
+           if (checklinespace && (cp = bufp + gotlen - 2) > bufp &&
+                       isspace ((unsigned char) *cp)) {

                linespace = 1;
                checklinespace = 0;     /* no need to keep checking */
            }
                linespace = 1;
                checklinespace = 0;     /* no need to keep checking */
            }


@@ -1278,75 +1451,88 @@ scan_content (CT ct)
             * Check if content contains a line that clashes
             * with our standard boundary for multipart messages.
             */
             * Check if content contains a line that clashes
             * with our standard boundary for multipart messages.
             */

-           if (checkboundary && buffer[0] == '-' && buffer[1] == '-') {
-               for (cp = buffer + strlen (buffer) - 1; cp >= buffer; cp--)
-                   if (!isspace (*cp))
+           if (checkboundary && bufp[0] == '-' && bufp[1] == '-') {
+               for (cp = bufp + gotlen - 1; cp >= bufp; cp--)
+                   if (!isspace ((unsigned char) *cp))

                        break;
                *++cp = '\0';
                        break;
                *++cp = '\0';

-               if (!strncmp(buffer + 2, prefix, len) && isdigit(buffer[2 + len])) {
+               if (!strncmp(bufp + 2, prefix, prefix_len) &&
+                           isdigit((unsigned char) bufp[2 + prefix_len])) {

                    boundaryclash = 1;
                    checkboundary = 0;  /* no need to keep checking */
                }
            }
        }
        fclose (in);
                    boundaryclash = 1;
                    checkboundary = 0;  /* no need to keep checking */
                }
            }
        }
        fclose (in);

+       free(bufp);

     }
 
     /*
     }
 
     /*

-     * Decide which transfer encoding to use.
+     * If the content is text and didn't specify a character set,
+     * we need to figure out which one was used.

      */
      */

-    switch (ct->c_type) {
-    case CT_TEXT:
-       /*
-        * If the text content didn't specify a character
-        * set, we need to figure out which one was used.
-        */
+
+    if (ct->c_type == CT_TEXT) {

        t = (struct text *) ct->c_ctparams;
        if (t->tx_charset == CHARSET_UNSPECIFIED) {
            CI ci = &ct->c_ctinfo;
        t = (struct text *) ct->c_ctparams;
        if (t->tx_charset == CHARSET_UNSPECIFIED) {
            CI ci = &ct->c_ctinfo;

-           char **ap, **ep;
-
-           for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++)
-               continue;
+           char *eightbitcharset = write_charset_8bit();

 
 

-           if (contains8bit) {
-               *ap = concat ("charset=", write_charset_8bit(), NULL);
-           } else {
-               *ap = add ("charset=us-ascii", NULL);
+           if (contains8bit && strcasecmp(eightbitcharset, "US-ASCII") == 0) {
+               adios(NULL, "Text content contains 8 bit characters, but "
+                     "character set is US-ASCII");

            }
            }

-           t->tx_charset = CHARSET_SPECIFIED;

 
 

-           cp = strchr(*ap++, '=');
-           *ap = NULL;
-           *cp++ = '\0';
-           *ep = cp;
+           add_param(&ci->ci_first_pm, &ci->ci_last_pm, "charset",
+                       contains8bit ? eightbitcharset : "us-ascii", 0);
+
+           t->tx_charset = CHARSET_SPECIFIED;

        }
        }

+    }

 
 

-       if (contains8bit || linelen || linespace || checksw)
-           ct->c_encoding = CE_QUOTED;
-       else
-           ct->c_encoding = CE_7BIT;
-       break;
+    /*
+     * Decide which transfer encoding to use.
+     */

 
 

-    case CT_APPLICATION:
-       /* For application type, use base64, except when postscript */
-       if (contains8bit || linelen || linespace || checksw)
-           ct->c_encoding = (ct->c_subtype == APPLICATION_POSTSCRIPT)
-               ? CE_QUOTED : CE_BASE64;
-       else
-           ct->c_encoding = CE_7BIT;
-       break;
+    if (ct->c_reqencoding != CE_UNKNOWN)
+       ct->c_encoding = ct->c_reqencoding;
+    else {
+       int wants_q_p = (containsnul || linelen || linespace || checksw);

 
 

-    case CT_MESSAGE:
-       ct->c_encoding = CE_7BIT;
-       break;
+       switch (ct->c_type) {
+       case CT_TEXT:
+            if (wants_q_p)
+                 ct->c_encoding = CE_QUOTED;
+            else if (contains8bit)
+                 ct->c_encoding = CE_8BIT;
+            else
+                 ct->c_encoding = CE_7BIT;

 
 

-    case CT_AUDIO:
-    case CT_IMAGE:
-    case CT_VIDEO:
-       /* For audio, image, and video contents, just use base64 */
-       ct->c_encoding = CE_BASE64;
-       break;
+           break;
+
+       case CT_APPLICATION:
+           /* For application type, use base64, except when postscript */
+           if (wants_q_p || contains8bit) {
+               if (ct->c_subtype == APPLICATION_POSTSCRIPT)
+                   ct->c_encoding = CE_QUOTED;  /* historical */
+               else
+                   ct->c_encoding = CE_BASE64;
+           } else {
+               ct->c_encoding = CE_7BIT;
+           }
+           break;
+
+       case CT_MESSAGE:
+           ct->c_encoding = contains8bit ? CE_8BIT : CE_7BIT;
+           break;
+
+       case CT_AUDIO:
+       case CT_IMAGE:
+       case CT_VIDEO:
+           /* For audio, image, and video contents, just use base64 */
+           ct->c_encoding = CE_BASE64;
+           break;
+        }

     }
 
     return (boundaryclash ? NOTOK : OK);
     }
 
     return (boundaryclash ? NOTOK : OK);


@@ -1360,10 +1546,9 @@ scan_content (CT ct)
  */
 
 static int
  */
 
 static int

-build_headers (CT ct)
+build_headers (CT ct, int header_encoding)

 {
 {

-    int        cc, mailbody, len;
-    char **ap, **ep;
+    int        cc, mailbody, extbody, len;

     char *np, *vp, buffer[BUFSIZ];
     CI ci = &ct->c_ctinfo;
 
     char *np, *vp, buffer[BUFSIZ];
     CI ci = &ct->c_ctinfo;
 


@@ -1372,16 +1557,10 @@ build_headers (CT ct)
      * boundary to the list of attribute/value pairs.
      */
     if (ct->c_type == CT_MULTIPART) {
      * boundary to the list of attribute/value pairs.
      */
     if (ct->c_type == CT_MULTIPART) {

-       char *cp;

        static int level = 0;   /* store nesting level */
 
        static int level = 0;   /* store nesting level */
 

-       ap = ci->ci_attrs;
-       ep = ci->ci_values;
-       snprintf (buffer, sizeof(buffer), "boundary=%s%d", prefix, level++);
-       cp = strchr(*ap++ = add (buffer, NULL), '=');
-       *ap = NULL;
-       *cp++ = '\0';
-       *ep = cp;
+       snprintf (buffer, sizeof(buffer), "%s%d", prefix, level++);
+       add_param(&ci->ci_first_pm, &ci->ci_last_pm, "boundary", buffer, 0);

     }
 
     /*
     }
 
     /*


@@ -1404,31 +1583,23 @@ build_headers (CT ct)
     len = strlen (TYPE_FIELD) + strlen (ci->ci_type)
                + strlen (ci->ci_subtype) + 3;
 
     len = strlen (TYPE_FIELD) + strlen (ci->ci_type)
                + strlen (ci->ci_subtype) + 3;
 

-    mailbody = ct->c_type == CT_MESSAGE
-       && ct->c_subtype == MESSAGE_EXTERNAL
-       && ((struct exbody *) ct->c_ctparams)->eb_body;
+    extbody = ct->c_type == CT_MESSAGE && ct->c_subtype == MESSAGE_EXTERNAL;
+    mailbody = extbody && ((struct exbody *) ct->c_ctparams)->eb_body;

 
     /*
      * Append the attribute/value pairs to
      * the end of the Content-Type line.
      */
 
     /*
      * Append the attribute/value pairs to
      * the end of the Content-Type line.
      */

-    for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
-       if (mailbody && !mh_strcasecmp (*ap, "body"))
-           continue;

 
 

-       vp = add (";", vp);
-       len++;
+    if (ci->ci_first_pm) {
+       char *s = output_params(len, ci->ci_first_pm, &len, mailbody);

 
 

-       snprintf (buffer, sizeof(buffer), "%s=\"%s\"", *ap, *ep);
-       if (len + 1 + (cc = strlen (buffer)) >= CPERLIN) {
-           vp = add ("\n\t", vp);
-           len = 8;
-       } else {
-           vp = add (" ", vp);
-           len++;
-       }
-       vp = add (buffer, vp);
-       len += cc;
+       if (!s)
+           adios(NULL, "Internal error: failed outputting Content-Type "
+               "parameters");
+
+       vp = add (s, vp);
+       free(s);

     }
 
     /*
     }
 
     /*


@@ -1458,23 +1629,34 @@ build_headers (CT ct)
        vp = concat (" ", ct->c_id, NULL);
        add_header (ct, np, vp);
     }
        vp = concat (" ", ct->c_id, NULL);
        add_header (ct, np, vp);
     }

-

     /*
      * output the Content-Description
      */
     if (ct->c_descr) {
        np = add (DESCR_FIELD, NULL);
        vp = concat (" ", ct->c_descr, NULL);
     /*
      * output the Content-Description
      */
     if (ct->c_descr) {
        np = add (DESCR_FIELD, NULL);
        vp = concat (" ", ct->c_descr, NULL);

+       if (encode_rfc2047(DESCR_FIELD, &vp, header_encoding, NULL))
+           adios(NULL, "Unable to encode %s header", DESCR_FIELD);

        add_header (ct, np, vp);
     }
 
     /*
        add_header (ct, np, vp);
     }
 
     /*

-     * output the Content-Disposition
+     * output the Content-Disposition.  If it's NULL but c_dispo_type is
+     * set, then we need to build it.

      */
     if (ct->c_dispo) {
        np = add (DISPO_FIELD, NULL);
        vp = concat (" ", ct->c_dispo, NULL);
        add_header (ct, np, vp);
      */
     if (ct->c_dispo) {
        np = add (DISPO_FIELD, 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;
+       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);

     }
 
 skip_headers:
     }
 
 skip_headers:


@@ -1504,9 +1686,6 @@ skip_headers:
        break;
 
     case CE_8BIT:
        break;
 
     case CE_8BIT:

-       if (ct->c_type == CT_MESSAGE)
-           adios (NULL, "internal error, invalid encoding");
-

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


@@ -1558,7 +1737,7 @@ skip_headers:
            CT p;
 
            p = part->mp_part;
            CT p;
 
            p = part->mp_part;

-           build_headers (p);
+           build_headers (p, header_encoding);

        }
     }
        break;
        }
     }
        break;


@@ -1568,7 +1747,7 @@ skip_headers:
            struct exbody *e;
 
            e = (struct exbody *) ct->c_ctparams;
            struct exbody *e;
 
            e = (struct exbody *) ct->c_ctparams;

-           build_headers (e->eb_content);
+           build_headers (e->eb_content, header_encoding);

        }
        break;
 
        }
        break;
 


@@ -1588,12 +1767,12 @@ static char *
 calculate_digest (CT ct, int asciiP)
 {
     int        cc;
 calculate_digest (CT ct, int asciiP)
 {
     int        cc;

-    char buffer[BUFSIZ], *vp, *op;
+    char *vp, *op;

     unsigned char *dp;
     unsigned char digest[16];
     unsigned char outbuf[25];
     MD5_CTX mdContext;
     unsigned char *dp;
     unsigned char digest[16];
     unsigned char outbuf[25];
     MD5_CTX mdContext;

-    CE ce = ct->c_cefile;
+    CE ce = &ct->c_cefile;

     char *infilename = ce->ce_file ? ce->ce_file : ct->c_file;
     FILE *in;
 
     char *infilename = ce->ce_file ? ce->ce_file : ct->c_file;
     FILE *in;
 


@@ -1606,20 +1785,24 @@ calculate_digest (CT ct, int asciiP)
 
     /* calculate md5 message digest */
     if (asciiP) {
 
     /* calculate md5 message digest */
     if (asciiP) {

-       while (fgets (buffer, sizeof(buffer) - 1, in)) {
+       char *bufp = NULL;
+       size_t buflen;
+       ssize_t gotlen;
+       while ((gotlen = getline(&bufp, &buflen, in)) != -1) {

            char c, *cp;
 
            char c, *cp;
 

-           cp = buffer + strlen (buffer) - 1;
+           cp = bufp + gotlen - 1;

            if ((c = *cp) == '\n')
            if ((c = *cp) == '\n')

-               *cp = '\0';
+               gotlen--;

 
 

-           MD5Update (&mdContext, (unsigned char *) buffer,
-                      (unsigned int) strlen (buffer));
+           MD5Update (&mdContext, (unsigned char *) bufp,
+                      (unsigned int) gotlen);

 
            if (c == '\n')
                MD5Update (&mdContext, (unsigned char *) "\r\n", 2);
        }
     } else {
 
            if (c == '\n')
                MD5Update (&mdContext, (unsigned char *) "\r\n", 2);
        }
     } else {

+       char buffer[BUFSIZ];

        while ((cc = fread (buffer, sizeof(*buffer), sizeof(buffer), in)) > 0)
            MD5Update (&mdContext, (unsigned char *) buffer, (unsigned int) cc);
     }
        while ((cc = fread (buffer, sizeof(*buffer), sizeof(buffer), in)) > 0)
            MD5Update (&mdContext, (unsigned char *) buffer, (unsigned int) cc);
     }


@@ -1642,7 +1825,8 @@ calculate_digest (CT ct, int asciiP)
     }
 
     /* encode the digest using base64 */
     }
 
     /* encode the digest using base64 */

-    for (dp = digest, op = outbuf, cc = sizeof(digest) / sizeof(digest[0]);
+    for (dp = digest, op = (char *) outbuf,
+                               cc = sizeof(digest) / sizeof(digest[0]);

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


@@ -1670,3 +1854,117 @@ calculate_digest (CT ct, int asciiP)
     vp = concat (" ", outbuf, "\n", NULL);
     return vp;
 }
     vp = concat (" ", outbuf, "\n", NULL);
     return vp;
 }

+
+/*
+ * Set things up for the content structure for file "filename" that
+ * we want to attach
+ */
+
+static void
+setup_attach_content(CT ct, char *filename)
+{
+    char *type, *simplename = r1bindex(filename, '/');
+    struct str2init *s2i;
+    PM pm;
+    char *cp;
+
+    if (! (type = mime_type(filename))) {
+       adios(NULL, "Unable to determine MIME type of \"%s\"", filename);
+    }
+
+    /*
+     * 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.
+     * Map that to a valid content-type label and call any initialization
+     * function.
+     */
+
+    if (get_ctinfo(type, ct, 0) == NOTOK)
+       done(1);
+
+    free(type);
+
+    for (s2i = str2cts; s2i->si_key; s2i++)
+       if (strcasecmp(ct->c_ctinfo.ci_type, s2i->si_key) == 0)
+           break;
+    if (!s2i->si_key && !uprf(ct->c_ctinfo.ci_type, "X-"))
+       s2i++;
+
+    /*
+     * Make sure the type isn't incompatible with what we can handle
+     */
+
+    switch (ct->c_type = s2i->si_val) {
+    case CT_MULTIPART:
+       adios (NULL, "multipart types must be specified by mhbuild directives");
+       /* NOTREACHED */
+
+    case CT_MESSAGE:
+       if (strcasecmp(ct->c_ctinfo.ci_subtype, "partial") == 0)
+           adios(NULL, "Sorry, %s/%s isn't supported", ct->c_ctinfo.ci_type,
+               ct->c_ctinfo.ci_subtype);
+       if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0)
+           adios(NULL, "external-body messages must be specified "
+               "by mhbuild directives");
+       /* Fall through */
+
+    default:
+       /*
+        * This sets the subtype, if it's significant
+        */
+       if ((ct->c_ctinitfnx = s2i->si_init))
+           (*ct->c_ctinitfnx)(ct);
+       break;
+    }
+
+    /*
+     * Feed in a few attributes; specifically, the name attribute, the
+     * content-description, and the content-disposition.
+     */
+
+    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);
+           break;
+       }
+    }
+
+    if (pm == NULL)
+       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 = add("\n", ct->c_descr);
+    ct->c_cefile.ce_file = getcpy(filename);
+
+    /*
+     * Look for mhbuild-disposition-<type>/<subtype> entry
+     * that specifies Content-Disposition type.  Only
+     * 'attachment' and 'inline' are allowed.  Default to
+     * 'attachment'.
+     */
+
+    cp = context_find_by_type ("disposition", ct->c_ctinfo.ci_type,
+                               ct->c_ctinfo.ci_subtype);
+    if (cp != NULL) {
+        if (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);
+        }
+    }
+
+    if (cp) {
+       ct->c_dispo_type = getcpy(cp);
+    } else {
+       ct->c_dispo_type = getcpy("attachment");
+    }
+
+    add_param(&ct->c_dispo_first, &ct->c_dispo_last, "filename", simplename, 0);
+}