Fixed typos in comments.

[nmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index e44f01416bafb78d84db0fd5809296125f32102b..7e2f9f48dd3cd43962f78be31b80e9880505162d 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -32,7 +32,6 @@
 
 
 extern int debugsw;
 
 
 extern int debugsw;

-extern int verbosw;

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


@@ -42,8 +41,6 @@ extern int contentidsw;
 extern int rcachesw;   /* mhcachesbr.c */
 extern int wcachesw;   /* mhcachesbr.c */
 
 extern int rcachesw;   /* mhcachesbr.c */
 extern int wcachesw;   /* mhcachesbr.c */
 

-pid_t xpid = 0;
-

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


@@ -71,14 +68,14 @@ void free_encoding (CT, 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 void setup_attach_content(CT, char *);
 static char *fgetstr (char *, int, FILE *);

-static int user_content (FILE *, 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 compose_content (CT, int);

 static int scan_content (CT, size_t);
 static int scan_content (CT, size_t);

-static int build_headers (CT);
+static int build_headers (CT, int);

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


@@ -124,7 +121,7 @@ static void directive_pop(void)
 
 CT
 build_mime (char *infile, int autobuild, int dist, int directives,
 
 CT
 build_mime (char *infile, int autobuild, int dist, int directives,

-           int header_encoding, size_t maxunencoded)
+           int header_encoding, size_t maxunencoded, int verbose)

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


@@ -156,7 +153,7 @@ build_mime (char *infile, int autobuild, int dist, 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


@@ -173,7 +170,7 @@ build_mime (char *infile, int autobuild, int dist, int directives,
 
            /* abort if draft has Mime-Version or C-T-E header field */
            if (strcasecmp (name, VRSN_FIELD) == 0 ||
 
            /* abort if draft has Mime-Version or C-T-E header field */
            if (strcasecmp (name, VRSN_FIELD) == 0 ||

-               strcasecmp (name, ENCODING_FIELD) == 0) {
+               strcasecmp (name, ENCODING_FIELD) == 0) {

                if (autobuild) {
                    fclose(in);
                    return NULL;
                if (autobuild) {
                    fclose(in);
                    return NULL;


@@ -208,9 +205,9 @@ build_mime (char *infile, int autobuild, int dist, int directives,
             */
 
            if (strcasecmp(ATTACH_FIELD, np) == 0) {
             */
 
            if (strcasecmp(ATTACH_FIELD, np) == 0) {

-               struct attach_list *entry;
+               struct attach_list *entry;

                char *s = vp, *e = vp + strlen(vp) - 1;
                char *s = vp, *e = vp + strlen(vp) - 1;

-               free(np);
+               free(np);

 
                /*
                 * Make sure we can find the start of this filename.
 
                /*
                 * Make sure we can find the start of this filename.


@@ -271,7 +268,7 @@ finish_field:
      */
 
     for (hp = ct->c_first_hf; hp != NULL; hp = hp->next) {
      */
 
     for (hp = ct->c_first_hf; hp != NULL; hp = hp->next) {

-       if (encode_rfc2047(hp->name, &hp->value, header_encoding, NULL)) {
+       if (encode_rfc2047(hp->name, &hp->value, header_encoding, NULL)) {

            adios(NULL, "Unable to encode header \"%s\"", hp->name);
        }
     }
            adios(NULL, "Unable to encode header \"%s\"", hp->name);
        }
     }


@@ -296,7 +293,6 @@ 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)
        adios (NULL, "out of memory");
 
     if ((m = (struct multipart *) calloc (1, sizeof(*m))) == NULL)
        adios (NULL, "out of memory");


@@ -311,7 +307,7 @@ finish_field:
        struct part *part;
        CT p;
 
        struct part *part;
        CT p;
 

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

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


@@ -331,8 +327,8 @@ finish_field:
      */
 
     for (at_entry = attach_head; at_entry; ) {
      */
 
     for (at_entry = attach_head; at_entry; ) {

-       struct attach_list *at_prev = at_entry;
-       struct part *part;
+       struct attach_list *at_prev = at_entry;
+       struct part *part;

        CT p;
 
        if (access(at_entry->filename, R_OK) != 0) {
        CT p;
 
        if (access(at_entry->filename, R_OK) != 0) {


@@ -342,7 +338,7 @@ finish_field:
        if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
            adios(NULL, "out of memory");
 
        if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
            adios(NULL, "out of memory");
 

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

 
        /*
         * Initialize our content structure based on the filename,
 
        /*
         * Initialize our content structure based on the filename,


@@ -369,14 +365,14 @@ finish_field:
      */
 
     if (!m->mp_parts) {
      */
 
     if (!m->mp_parts) {

-       CT p;
-       struct part *part;
+       CT p;
+       struct part *part;

        struct text *t;
 
        if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
            adios(NULL, "out of memory");
 
        struct text *t;
 
        if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
            adios(NULL, "out of memory");
 

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

 
        if (get_ctinfo ("text/plain", p, 0) == NOTOK)
            done (1);
 
        if (get_ctinfo ("text/plain", p, 0) == NOTOK)
            done (1);


@@ -384,7 +380,6 @@ finish_field:
        p->c_type = CT_TEXT;
        p->c_subtype = TEXT_PLAIN;
        p->c_encoding = CE_7BIT;
        p->c_type = CT_TEXT;
        p->c_subtype = TEXT_PLAIN;
        p->c_encoding = CE_7BIT;

-       p->c_file = getcpy(infile);

        /*
         * Sigh.  ce_file contains the "decoded" contents of this part.
         * So this seems like the best option available since we're going
        /*
         * Sigh.  ce_file contains the "decoded" contents of this part.
         * So this seems like the best option available since we're going


@@ -439,7 +434,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)");


@@ -455,14 +450,14 @@ 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
+           else

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

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

 
     return ct;
 }
 
     return ct;
 }


@@ -474,11 +469,13 @@ finish_field:
  */
 
 static int
  */
 
 static int

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

 {
     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;
 }


@@ -528,7 +525,7 @@ fgetstr (char *s, int n, FILE *stream)
  */
 
 static int
  */
 
 static int

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

 {
     int        extrnal, vrsn;
     char *cp, **ap;
 {
     int        extrnal, vrsn;
     char *cp, **ap;


@@ -552,7 +549,7 @@ user_content (FILE *in, char *buf, CT *ctp)
     *ctp = ct;
 
     /* allocate basic structure for handling decoded content */
     *ctp = ct;
 
     /* allocate basic structure for handling decoded content */

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

     ce = &ct->c_cefile;
 
     ci = &ct->c_ctinfo;
     ce = &ct->c_cefile;
 
     ci = &ct->c_ctinfo;


@@ -781,6 +778,7 @@ use_forw:
             */
            if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL)
                adios (NULL, "out of memory");
             */
            if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL)
                adios (NULL, "out of memory");

+           init_decoded_content(ct, infilename);

            *ctp = ct;
            ci = &ct->c_ctinfo;
            if (get_ctinfo (buffer, ct, 0) == NOTOK)
            *ctp = ct;
            ci = &ct->c_ctinfo;
            if (get_ctinfo (buffer, ct, 0) == NOTOK)


@@ -915,7 +913,7 @@ use_forw:
 
                    if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
                        adios (NULL, "out of memory");
 
                    if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
                        adios (NULL, "out of memory");

-                   init_decoded_content (p);
+                   init_decoded_content (p, infilename);

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


@@ -997,7 +995,7 @@ use_forw:
            struct part *part;
            CT p;
 
            struct part *part;
            CT p;
 

-           if (user_content (in, 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;


@@ -1049,7 +1047,7 @@ 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;
 


@@ -1075,7 +1073,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;
        }
 


@@ -1127,7 +1125,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;


@@ -1159,11 +1157,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;


@@ -1211,7 +1210,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);
 


@@ -1280,13 +1279,17 @@ raw:
 static int
 scan_content (CT ct, size_t maxunencoded)
 {
 static int
 scan_content (CT ct, size_t maxunencoded)
 {

-    int len;
+    int prefix_len;

     int check8bit = 0, contains8bit = 0;  /* check if contains 8bit data */
     int check8bit = 0, contains8bit = 0;  /* check if contains 8bit data */

-    int checklinelen = 0, linelen = 0;  /* check for long lines */ 
+    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 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          */

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

     struct text *t = NULL;
     FILE *in = NULL;
     CE ce = &ct->c_cefile;
     struct text *t = NULL;
     FILE *in = NULL;
     CE ce = &ct->c_cefile;


@@ -1319,26 +1322,35 @@ scan_content (CT ct, size_t maxunencoded)
     }
 
     /*
     }
 
     /*

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

      */
 
      */
 

+    if (ct->c_type == CT_TEXT) {
+       t = (struct text *) ct->c_ctparams;
+       if (t->tx_charset == CHARSET_UNSPECIFIED) {
+           check8bit = 1;
+           checknul = 1;
+       }
+    }
+

     switch (ct->c_reqencoding) {
     case CE_8BIT:
     switch (ct->c_reqencoding) {
     case CE_8BIT:

-       checkllinelen = 1;
+       checkllinelen = 1;

        checkboundary = 1;
        break;
     case CE_QUOTED:
        checkboundary = 1;
        break;
     case CE_QUOTED:

-       checkboundary = 1;
+       checkboundary = 1;

        break;
     case CE_BASE64:
        break;
     case CE_BASE64:

-       /* We check nothing here */

        break;
     case CE_UNKNOWN:
        break;
     case CE_UNKNOWN:

-       /* Use the default rules based on content-type */
+       /* Use the default rules based on content-type */

        switch (ct->c_type) {
        case CT_TEXT:
            checkboundary = 1;
        switch (ct->c_type) {
        case CT_TEXT:
            checkboundary = 1;

-           check8bit = 1;

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


@@ -1349,21 +1361,24 @@ scan_content (CT ct, size_t maxunencoded)
 
        case CT_APPLICATION:
            check8bit = 1;
 
        case CT_APPLICATION:
            check8bit = 1;

+           checknul = 1;

            checklinelen = 1;
            checklinespace = 1;
            checkboundary = 1;
        break;
 
        case CT_MESSAGE:
            checklinelen = 1;
            checklinespace = 1;
            checkboundary = 1;
        break;
 
        case CT_MESSAGE:

-           check8bit = 0;

            checklinelen = 0;
            checklinespace = 0;
 
            /* don't check anything for message/external */
            checklinelen = 0;
            checklinespace = 0;
 
            /* don't check anything for message/external */

-           if (ct->c_subtype == MESSAGE_EXTERNAL)
+           if (ct->c_subtype == MESSAGE_EXTERNAL) {

                checkboundary = 0;
                checkboundary = 0;

-           else
+               check8bit = 0;
+           } else {

                checkboundary = 1;
                checkboundary = 1;

+               check8bit = 1;
+           }

            break;
 
        case CT_AUDIO:
            break;
 
        case CT_AUDIO:


@@ -1386,28 +1401,31 @@ scan_content (CT ct, size_t maxunencoded)
      * Scan the unencoded content
      */
     if (check8bit || checklinelen || checklinespace || checkboundary ||
      * Scan the unencoded content
      */
     if (check8bit || checklinelen || checklinespace || checkboundary ||

-       checkllinelen) {
+       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 ((unsigned char) *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) > maxunencoded + 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 */
            }


@@ -1419,7 +1437,7 @@ scan_content (CT ct, size_t maxunencoded)
             */
 
            if (checkllinelen && !linelen &&
             */
 
            if (checkllinelen && !linelen &&

-                                       (strlen(buffer) > MAXLONGLINE + 1)) {
+                                       (gotlen > MAXLONGLINE + 1)) {

                adios(NULL, "Line in content exceeds maximum line limit (%d)",
                      MAXLONGLINE);
            }
                adios(NULL, "Line in content exceeds maximum line limit (%d)",
                      MAXLONGLINE);
            }


@@ -1427,7 +1445,8 @@ scan_content (CT ct, size_t maxunencoded)
            /*
             * Check if line ends with a space.
             */
            /*
             * Check if line ends with a space.
             */

-           if (checklinespace && (cp = buffer + strlen (buffer) - 2) > buffer && isspace ((unsigned char) *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 */
            }


@@ -1436,18 +1455,36 @@ scan_content (CT ct, size_t maxunencoded)
             * 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 (checkboundary && bufp[0] == '-' && bufp[1] == '-') {
+               for (cp = bufp + gotlen - 1; cp >= bufp; cp--)

                    if (!isspace ((unsigned char) *cp))
                        break;
                *++cp = '\0';
                    if (!isspace ((unsigned char) *cp))
                        break;
                *++cp = '\0';

-               if (!strncmp(buffer + 2, prefix, len) && isdigit((unsigned char) 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);
+    }
+
+    /*
+     * If the content is text and 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;
+
+           add_param(&ci->ci_first_pm, &ci->ci_last_pm, "charset",
+                       contains8bit ? write_charset_8bit() : "us-ascii", 0);
+           t->tx_charset = CHARSET_SPECIFIED;
+       }

     }
 
     /*
     }
 
     /*


@@ -1455,54 +1492,35 @@ scan_content (CT ct, size_t maxunencoded)
      */
 
     if (ct->c_reqencoding != CE_UNKNOWN)
      */
 
     if (ct->c_reqencoding != CE_UNKNOWN)

-       ct->c_encoding = ct->c_reqencoding;
-    else
+       ct->c_encoding = ct->c_reqencoding;
+    else {
+       int wants_q_p = (containsnul || linelen || linespace || checksw);
+

        switch (ct->c_type) {
        case CT_TEXT:
        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.
-            */
-           t = (struct text *) ct->c_ctparams;
-           if (t->tx_charset == CHARSET_UNSPECIFIED) {
-               CI ci = &ct->c_ctinfo;
-               char **ap, **ep;
+            if (wants_q_p)
+                 ct->c_encoding = CE_QUOTED;
+            else if (contains8bit)
+                 ct->c_encoding = CE_8BIT;
+            else
+                 ct->c_encoding = CE_7BIT;

 
 

-               for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++)
-                   continue;
-
-               if (contains8bit) {
-                   *ap = concat ("charset=", write_charset_8bit(), NULL);
-               } else {
-                   *ap = add ("charset=us-ascii", NULL);
-               }
-               t->tx_charset = CHARSET_SPECIFIED;
-
-               cp = strchr(*ap++, '=');
-               *ap = NULL;
-               *cp++ = '\0';
-               *ep = cp;
-           }
-
-           if (contains8bit && !linelen && !linespace && !checksw)
-               ct->c_encoding = CE_8BIT;
-           else if (contains8bit || linelen || linespace || checksw)
-               ct->c_encoding = CE_QUOTED;
-           else
-               ct->c_encoding = CE_7BIT;

            break;
 
        case CT_APPLICATION:
            /* For application type, use base64, except when postscript */
            break;
 
        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
+           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;
                ct->c_encoding = CE_7BIT;

+           }

            break;
 
        case CT_MESSAGE:
            break;
 
        case CT_MESSAGE:

-           ct->c_encoding = CE_7BIT;
+           ct->c_encoding = contains8bit ? CE_8BIT : CE_7BIT;

            break;
 
        case CT_AUDIO:
            break;
 
        case CT_AUDIO:


@@ -1512,6 +1530,7 @@ scan_content (CT ct, size_t maxunencoded)
            ct->c_encoding = CE_BASE64;
            break;
         }
            ct->c_encoding = CE_BASE64;
            break;
         }

+    }

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


@@ -1524,10 +1543,9 @@ scan_content (CT ct, size_t maxunencoded)
  */
 
 static int
  */
 
 static int

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

 {
     int        cc, mailbody, extbody, len;
 {
     int        cc, mailbody, extbody, len;

-    char **ap, **ep;

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


@@ -1536,16 +1554,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);

     }
 
     /*
     }
 
     /*


@@ -1575,59 +1587,16 @@ build_headers (CT ct)
      * 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 && !strcasecmp (*ap, "body"))
-           continue;
-
-       vp = add (";", vp);
-       len++;

 
 

-       /*
-        * According to RFC 2017, if we have a URL longer than 40 characters
-        * we have to break it across multiple lines
-        */
+    if (ci->ci_first_pm) {
+       char *s = output_params(len, ci->ci_first_pm, &len, mailbody);

 
 

-       if (extbody && strcasecmp (*ap, "url") == 0) {
-           char *value = *ep;
-
-           /* 7 here refers to " url=\"\"" */
-           if (len + 1 + (cc = (min(MAXURLTOKEN, strlen(value)) + 7)) >=
-                                                               CPERLIN) {
-               vp = add ("\n\t", vp);
-               len = 8;
-           } else {
-               vp = add (" ", vp);
-               len++;
-           }
-
-           vp = add ("url=\"", vp);
-           len += 5;
-
-           while (strlen(value) > MAXURLTOKEN) {
-               strncpy(buffer, value, MAXURLTOKEN);
-               buffer[MAXURLTOKEN] = '\0';
-               vp = add (buffer, vp);
-               vp = add ("\n\t", vp);
-               value += MAXURLTOKEN;
-               len = 8;
-           }
-
-           vp = add (value, vp);
-           vp = add ("\"", vp);
-           len += strlen(value) + 1;
-           continue;
-       }
+       if (!s)
+           adios(NULL, "Internal error: failed outputting Content-Type "
+               "parameters");

 
 

-       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;
+       vp = add (s, vp);
+       free(s);

     }
 
     /*
     }
 
     /*


@@ -1657,23 +1626,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:


@@ -1703,9 +1683,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);


@@ -1757,7 +1734,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;


@@ -1767,7 +1744,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;
 


@@ -1787,7 +1764,7 @@ 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];
     unsigned char *dp;
     unsigned char digest[16];
     unsigned char outbuf[25];


@@ -1805,20 +1782,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);
     }


@@ -1842,7 +1823,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) / 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;


@@ -1879,11 +1860,14 @@ calculate_digest (CT ct, int asciiP)
 static void
 setup_attach_content(CT ct, char *filename)
 {
 static void
 setup_attach_content(CT ct, char *filename)
 {

-    char *type, **ap, **ep, *simplename = r1bindex(filename, '/');
+    char *type, *simplename = r1bindex(filename, '/');

     struct str2init *s2i;
     struct str2init *s2i;

+    PM pm;
+    char buffer[BUFSIZ], *cp;
+    int no_subtype = 0;

 
     if (! (type = mime_type(filename))) {
 
     if (! (type = mime_type(filename))) {

-       adios(NULL, "Unable to determine MIME type of \"%s\"", filename);
+       adios(NULL, "Unable to determine MIME type of \"%s\"", filename);

     }
 
     /*
     }
 
     /*


@@ -1894,12 +1878,12 @@ setup_attach_content(CT ct, char *filename)
      */
 
     if (get_ctinfo(type, ct, 0) == NOTOK)
      */
 
     if (get_ctinfo(type, ct, 0) == NOTOK)

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

 
     free(type);
 
     for (s2i = str2cts; s2i->si_key; s2i++)
 
     free(type);
 
     for (s2i = str2cts; s2i->si_key; s2i++)

-       if (strcasecmp(ct->c_ctinfo.ci_type, s2i->si_key) == 0)
+       if (strcasecmp(ct->c_ctinfo.ci_type, s2i->si_key) == 0)

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


@@ -1910,23 +1894,23 @@ setup_attach_content(CT ct, char *filename)
 
     switch (ct->c_type = s2i->si_val) {
     case CT_MULTIPART:
 
     switch (ct->c_type = s2i->si_val) {
     case CT_MULTIPART:

-       adios (NULL, "multipart types must be specified by mhbuild directives");
+       adios (NULL, "multipart types must be specified by mhbuild directives");

        /* NOTREACHED */
 
     case CT_MESSAGE:
        /* NOTREACHED */
 
     case CT_MESSAGE:

-       if (strcasecmp(ct->c_ctinfo.ci_subtype, "partial") == 0)
+       if (strcasecmp(ct->c_ctinfo.ci_subtype, "partial") == 0)

            adios(NULL, "Sorry, %s/%s isn't supported", ct->c_ctinfo.ci_type,
            adios(NULL, "Sorry, %s/%s isn't supported", ct->c_ctinfo.ci_type,

-                 ct->c_ctinfo.ci_subtype);
+               ct->c_ctinfo.ci_subtype);

        if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0)
            adios(NULL, "external-body messages must be specified "
        if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0)
            adios(NULL, "external-body messages must be specified "

-                 "by mhbuild directives");
+               "by mhbuild directives");

        /* Fall through */
 
     default:
        /* Fall through */
 
     default:

-       /*
+       /*

         * This sets the subtype, if it's significant
         */
         * This sets the subtype, if it's significant
         */

-       if ((ct->c_ctinitfnx = s2i->si_init))
+       if ((ct->c_ctinitfnx = s2i->si_init))

            (*ct->c_ctinitfnx)(ct);
        break;
     }
            (*ct->c_ctinitfnx)(ct);
        break;
     }


@@ -1936,38 +1920,57 @@ setup_attach_content(CT ct, char *filename)
      * content-description, and the content-disposition.
      */
 
      * content-description, and the content-disposition.
      */
 

-    for (ap = ct->c_ctinfo.ci_attrs, ep = ct->c_ctinfo.ci_values; *ap;
-        ap++, ep++) {
-       if (strcasecmp(*ap, "name") == 0) {
-           if (*ep)
-               free(*ep);
-           *ep = getcpy(simplename);
+    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;
        }
     }
 
            break;
        }
     }
 

-    if (*ap == NULL) {
-       *ap = getcpy("name");
-       *ep = getcpy(simplename);
-    }
+    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);
 
     /*
 
     ct->c_descr = getcpy(simplename);
     ct->c_descr = add("\n", ct->c_descr);
     ct->c_cefile.ce_file = getcpy(filename);
 
     /*

-     * If it's a text/calendar, we need to make sure it's an inline,
-     * otherwise it won't work with some calendar programs.  Otherwise
-     * assume attachment
+     * Look for mhbuild-disposition-<type>/<subtype> entry
+     * that specifies Content-Disposition type.  Only
+     * 'attachment' and 'inline' are allowed.  Default to
+     * 'attachment'.

      */
 
      */
 

-    if (strcasecmp(ct->c_ctinfo.ci_type, "text") == 0 &&
-       strcasecmp(ct->c_ctinfo.ci_subtype, "calendar") == 0) {
-       ct->c_dispo = getcpy("inline; filename=\"");
+    snprintf (buffer, sizeof(buffer), "%s-disposition-%s/%s",
+              invo_name, ct->c_ctinfo.ci_type, ct->c_ctinfo.ci_subtype);
+    cp = context_find (buffer);
+    if (cp == NULL || *cp == '\0') {
+        no_subtype = 1;
+        snprintf (buffer, sizeof(buffer), "%s-disposition-%s", invo_name,
+                  ct->c_ctinfo.ci_type);
+        cp = context_find (buffer);
+    }
+    if (cp != NULL && *cp != '\0') {
+        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,
+                      no_subtype ? "" : "/",
+                      no_subtype ? "" : ct->c_ctinfo.ci_subtype,
+                      cp);
+        }
+    }
+
+    if (cp) {
+       ct->c_dispo_type = getcpy(cp);

     } else {
     } else {

-       ct->c_dispo = getcpy("attachment; filename=\"");
+       ct->c_dispo_type = getcpy("attachment");

     }
 
     }
 

-    ct->c_dispo = add(simplename, ct->c_dispo);
-    ct->c_dispo = add("\"\n", ct->c_dispo);
+    add_param(&ct->c_dispo_first, &ct->c_dispo_last, "filename", simplename, 0);

 }
 }