mhn.defaults: make fetch less agressive on FreeBSD.

[nmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 555e3b5c673d9fe70cac83acd493a09c5f71badb..68c555d36a2cf7b64804845153092fad56708cad 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -41,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 {


@@ -70,10 +68,10 @@ 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 int compose_content (CT, int);
 static int scan_content (CT, size_t);
 static void set_id (CT, int);
 static int compose_content (CT, int);
 static int scan_content (CT, size_t);


@@ -155,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


@@ -172,9 +170,10 @@ 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);
                if (autobuild) {
                    fclose(in);

+                   free (ct);

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


@@ -207,9 +206,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.


@@ -270,7 +269,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);
        }
     }


@@ -295,7 +294,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");


@@ -310,7 +308,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;
        }


@@ -330,8 +328,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) {


@@ -341,7 +339,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,


@@ -368,14 +366,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);


@@ -383,7 +381,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


@@ -402,7 +399,6 @@ finish_field:
        if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
            adios (NULL, "out of memory");
        *pp = part;
        if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
            adios (NULL, "out of memory");
        *pp = part;

-       pp = &part->mp_next;

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


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

-           else
+           else

                (*cp)++;
        }
     }
                (*cp)++;
        }
     }


@@ -473,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;
 }


@@ -527,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;


@@ -551,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;


@@ -780,8 +778,8 @@ 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;
            *ctp = ct;

-           ci = &ct->c_ctinfo;

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


@@ -828,14 +826,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;


@@ -914,7 +908,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);


@@ -996,7 +990,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;


@@ -1163,7 +1157,7 @@ compose_content (CT ct, int verbose)
 
                        for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
                            snprintf (bp, buflen, "%s%s=\"%s\"", s,
 
                        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, '?'));
+                                   pm->pm_name, get_param_value(pm, '?'));

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


@@ -1280,13 +1274,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;


@@ -1327,22 +1325,24 @@ scan_content (CT ct, size_t maxunencoded)
 
     if (ct->c_type == CT_TEXT) {
        t = (struct text *) ct->c_ctparams;
 
     if (ct->c_type == CT_TEXT) {
        t = (struct text *) ct->c_ctparams;

-       if (t->tx_charset == CHARSET_UNSPECIFIED)
+       if (t->tx_charset == CHARSET_UNSPECIFIED) {

            check8bit = 1;
            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_UNKNOWN:
        break;
     case CE_BASE64:
        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;


@@ -1356,21 +1356,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:


@@ -1393,28 +1396,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 */
            }


@@ -1426,7 +1432,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);
            }


@@ -1434,7 +1440,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 */
            }


@@ -1443,18 +1450,20 @@ 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);

     }
 
     /*
     }
 
     /*


@@ -1466,9 +1475,16 @@ scan_content (CT ct, size_t maxunencoded)
        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 *eightbitcharset = write_charset_8bit();
+
+           if (contains8bit && strcasecmp(eightbitcharset, "US-ASCII") == 0) {
+               adios(NULL, "Text content contains 8 bit characters, but "
+                     "character set is US-ASCII");
+           }

 
            add_param(&ci->ci_first_pm, &ci->ci_last_pm, "charset",
 
            add_param(&ci->ci_first_pm, &ci->ci_last_pm, "charset",

-                     contains8bit ? write_charset_8bit() : "us-ascii", 0);
+                       contains8bit ? eightbitcharset : "us-ascii", 0);
+

            t->tx_charset = CHARSET_SPECIFIED;
        }
     }
            t->tx_charset = CHARSET_SPECIFIED;
        }
     }


@@ -1478,29 +1494,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 (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;
+            if (wants_q_p)
+                 ct->c_encoding = CE_QUOTED;
+            else if (contains8bit)
+                 ct->c_encoding = CE_8BIT;
+            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:


@@ -1510,6 +1532,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);
 }


@@ -1572,7 +1595,7 @@ build_headers (CT ct, int header_encoding)
 
        if (!s)
            adios(NULL, "Internal error: failed outputting Content-Type "
 
        if (!s)
            adios(NULL, "Internal error: failed outputting Content-Type "

-                 "parameters");
+               "parameters");

 
        vp = add (s, vp);
        free(s);
 
        vp = add (s, vp);
        free(s);


@@ -1662,9 +1685,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);


@@ -1746,7 +1766,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];


@@ -1764,20 +1784,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);
     }


@@ -1801,7 +1825,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;


@@ -1841,9 +1865,10 @@ setup_attach_content(CT ct, char *filename)
     char *type, *simplename = r1bindex(filename, '/');
     struct str2init *s2i;
     PM pm;
     char *type, *simplename = r1bindex(filename, '/');
     struct str2init *s2i;
     PM pm;

+    char *cp;

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

     }
 
     /*
     }
 
     /*


@@ -1854,12 +1879,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++;


@@ -1870,23 +1895,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;
     }


@@ -1899,14 +1924,14 @@ setup_attach_content(CT ct, char *filename)
     for (pm = ct->c_ctinfo.ci_first_pm; pm; pm = pm->pm_next) {
        if (strcasecmp(pm->pm_name, "name") == 0) {
            if (pm->pm_value)
     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);
+               free(pm->pm_value);

            pm->pm_value = getcpy(simplename);
            break;
        }
     }
 
     if (pm == NULL)
            pm->pm_value = getcpy(simplename);
            break;
        }
     }
 
     if (pm == NULL)

-       add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm,
+       add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm,

                  "name", simplename, 0);
 
     ct->c_descr = getcpy(simplename);
                  "name", simplename, 0);
 
     ct->c_descr = getcpy(simplename);


@@ -1914,16 +1939,30 @@ setup_attach_content(CT ct, char *filename)
     ct->c_cefile.ce_file = getcpy(filename);
 
     /*
     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_type = getcpy("inline");
+    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 {
     } else {

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

     }
 
     add_param(&ct->c_dispo_first, &ct->c_dispo_last, "filename", simplename, 0);
     }
 
     add_param(&ct->c_dispo_first, &ct->c_dispo_last, "filename", simplename, 0);