Sigh. Mention that we have to do both a "git push" and a "git push --tags".

[nmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 8d3a76dfb17506450a56c7f8cb51becb57cb18b7..cf7c53ac8bf972a1e955f436c5bfa27d0263c121 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,16 +41,13 @@ extern int contentidsw;
 extern int rcachesw;   /* mhcachesbr.c */
 extern int wcachesw;   /* mhcachesbr.c */
 
 extern int rcachesw;   /* mhcachesbr.c */
 extern int wcachesw;   /* mhcachesbr.c */
 

-/*
- * Directory to place tmp files.  This must
- * be set before these routines are called.
- */
-char *tmp;
-
-pid_t xpid = 0;
-

 static char prefix[] = "----- =_aaaaaaaaaa";
 
 static char prefix[] = "----- =_aaaaaaaaaa";
 

+struct attach_list {
+    char *filename;
+    struct attach_list *next;
+};
+

 /*
  * Maximum size of URL token in message/external-body
  */
 /*
  * Maximum size of URL token in message/external-body
  */


@@ -69,21 +65,17 @@ int find_cache (CT, int, int *, char *, char *, int);
 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);
 
 


@@ -128,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];


@@ -137,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);
 


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


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

-           /* abort if draft has Mime-Version header field */
-           if (!strcasecmp (name, VRSN_FIELD))
-               adios (NULL, "draft shouldn't contain %s: field", VRSN_FIELD);
-
-           /* abort if draft has Content-Transfer-Encoding header field */
-           if (!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);
+                   return NULL;
+               } else {
+                   adios (NULL, "draft shouldn't contain %s: field", name);
+               }
+           }

 
            /* ignore any Content-Type fields in the header */
            if (!strcasecmp (name, TYPE_FIELD)) {
 
            /* ignore any Content-Type fields in the header */
            if (!strcasecmp (name, TYPE_FIELD)) {


@@ -201,19 +199,56 @@ 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) {
+               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:


@@ -227,13 +262,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


@@ -244,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");


@@ -259,7 +307,7 @@ 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;
        }
            admonish (NULL, "ignoring spurious #end");
            continue;
        }


@@ -273,16 +321,93 @@ finish_field:
        part->mp_part = p;
     }
 
        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) calloc (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 *) calloc (1, sizeof(*part))) == NULL)
+           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) calloc (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 *) calloc (1, sizeof (*t))) == NULL)
+           adios (NULL, "out of memory");
+
+       t->tx_charset = CHARSET_SPECIFIED;
+       p->c_ctparams = t;
+
+       if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+           adios (NULL, "out of memory");
+       *pp = part;
+       pp = &part->mp_next;
+       part->mp_part = p;
+    }
+

     /*
      * close the composition draft since
      * it's not needed any longer.
      */
     fclose (in);
 
     /*
      * close the composition draft since
      * it's not needed any longer.
      */
     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.


@@ -309,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)");


@@ -319,7 +444,7 @@ 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 < 'z') {
            (*cp)++;
         } else {


@@ -331,7 +456,8 @@ finish_field:
     }
 
     /* Build the rest of the header field structures */
     }
 
     /* Build the rest of the header field structures */

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

 
     return ct;
 }
 
     return ct;
 }


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


@@ -397,7 +525,7 @@ 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;
     char *cp, **ap;
 {
     int        extrnal, vrsn;
     char *cp, **ap;


@@ -421,7 +549,7 @@ user_content (FILE *in, char *file, 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;


@@ -443,8 +571,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);


@@ -782,7 +912,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);


@@ -864,7 +994,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;


@@ -916,7 +1046,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;
 


@@ -942,7 +1072,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;
        }
 


@@ -994,7 +1124,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;


@@ -1003,10 +1133,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;
 


@@ -1026,11 +1156,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;


@@ -1078,7 +1209,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);
 


@@ -1145,11 +1276,12 @@ raw:
  */
 
 static int
  */
 
 static int

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

 {
     int len;
 {
     int len;

-    int check8bit = 0, contains8bit = 0;  /* check if contains 8bit data                */
-    int checklinelen = 0, linelen = 0;   /* check for long lines                       */
+    int check8bit = 0, contains8bit = 0;  /* check if contains 8bit data */
+    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          */
     char *cp = NULL, buffer[BUFSIZ];
     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];


@@ -1171,7 +1303,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 */


@@ -1185,58 +1317,83 @@ 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;
+
+    if (ct->c_type == CT_TEXT) {
+       t = (struct text *) ct->c_ctparams;
+       if (t->tx_charset == CHARSET_UNSPECIFIED)
+           check8bit = 1;
+    }
+
+    switch (ct->c_reqencoding) {
+    case CE_8BIT:
+       checkllinelen = 1;

        checkboundary = 1;
        checkboundary = 1;

-       if (ct->c_subtype == TEXT_PLAIN) {
-           checklinelen = 0;
-           checklinespace = 0;
-       } else {
+       break;
+    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;

            checklinelen = 1;
            checklinelen = 1;

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

        break;
 
        break;
 

-    case CT_APPLICATION:
-       check8bit = 1;
-       checklinelen = 1;
-       checklinespace = 1;
-       checkboundary = 1;
+       case CT_APPLICATION:
+           check8bit = 1;
+           checklinelen = 1;
+           checklinespace = 1;
+           checkboundary = 1;

        break;
 
        break;
 

-    case CT_MESSAGE:
-       check8bit = 0;
-       checklinelen = 0;
-       checklinespace = 0;
+       case CT_MESSAGE:
+           checklinelen = 0;
+           checklinespace = 0;

 
 

-       /* don't check anything for message/external */
-       if (ct->c_subtype == MESSAGE_EXTERNAL)
-           checkboundary = 0;
-       else
-           checkboundary = 1;
-       break;
+           /* 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.
-        */
-       check8bit = 0;
-       checklinelen = 0;
-       checklinespace = 0;
-       checkboundary = 0;
-       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) {

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


@@ -1250,6 +1407,7 @@ scan_content (CT ct)
                    if (!isascii ((unsigned char) *cp)) {
                        contains8bit = 1;
                        check8bit = 0;  /* no need to keep checking */
                    if (!isascii ((unsigned char) *cp)) {
                        contains8bit = 1;
                        check8bit = 0;  /* no need to keep checking */

+                       break;

                    }
                }
            }
                    }
                }
            }


@@ -1257,11 +1415,23 @@ scan_content (CT ct)
            /*
             * Check line length.
             */
            /*
             * Check line length.
             */

-           if (checklinelen && (strlen (buffer) > CPERLIN + 1)) {
+           if (checklinelen && (strlen (buffer) > 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 &&
+                                       (strlen(buffer) > 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.
             */


@@ -1289,61 +1459,58 @@ scan_content (CT ct)
     }
 
     /*
     }
 
     /*

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

 
 

-           if (contains8bit) {
-               *ap = concat ("charset=", write_charset_8bit(), NULL);
-           } else {
-               *ap = add ("charset=us-ascii", NULL);
-           }
+           add_param(&ci->ci_first_pm, &ci->ci_last_pm, "charset",
+                     contains8bit ? write_charset_8bit() : "us-ascii", 0);

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

-
-           cp = strchr(*ap++, '=');
-           *ap = NULL;
-           *cp++ = '\0';
-           *ep = cp;

        }
        }

+    }

 
 

-       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
+       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;
+           break;

 
 

-    case CT_MESSAGE:
-       ct->c_encoding = CE_7BIT;
-       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
+               ct->c_encoding = 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;
-    }
+       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);
 }


@@ -1356,10 +1523,9 @@ scan_content (CT ct)
  */
 
 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;
 


@@ -1368,16 +1534,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);

     }
 
     /*
     }
 
     /*


@@ -1407,59 +1567,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 (extbody && strcasecmp (*ap, "url") == 0) {
-           char *value = *ep;
+    if (ci->ci_first_pm) {
+       char *s = output_params(len, ci->ci_first_pm, &len, mailbody);

 
 

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

     }
 
     /*
     }
 
     /*


@@ -1489,23 +1606,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:


@@ -1535,9 +1663,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);


@@ -1589,7 +1714,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;


@@ -1599,7 +1724,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;
 


@@ -1702,3 +1827,102 @@ 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;
+
+    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);
+
+    /*
+     * 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
+     */
+
+    if (strcasecmp(ct->c_ctinfo.ci_type, "text") == 0 &&
+       strcasecmp(ct->c_ctinfo.ci_subtype, "calendar") == 0) {
+       ct->c_dispo_type = getcpy("inline");
+    } else {
+       ct->c_dispo_type = getcpy("attachment");
+    }
+
+    add_param(&ct->c_dispo_first, &ct->c_dispo_last, "filename", simplename, 0);
+}