X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6f133ca42e6552b505996de7f9afcbc8d47cb4cb..79f7ee461078bd837632b2ca9fdf94ab4a080a36:/uip/mhparse.c?ds=sidebyside

diff --git a/uip/mhparse.c b/uip/mhparse.c
index ea5400e0..c381bb85 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -11,8 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
@@ -31,10 +29,14 @@ extern int wcachesw;	/* mhcachesbr.c */
 int checksw = 0;	/* check Content-MD5 field */
 
 /*
- * Directory to place temp files.  This must
- * be set before these routines are called.
+ * These are for mhfixmsg to:
+ * 1) Instruct parser not to detect invalid Content-Transfer-Encoding
+ *    in a multipart.
+ * 2) Suppress the warning about bogus multipart content, and report it.
  */
-char *tmp;
+int skip_mp_cte_check;
+int suppress_bogus_mp_content_warning;
+int bogus_mp_content;
 
 /*
  * Structures for TEXT messages
@@ -78,6 +80,19 @@ struct k2v SubApplication[] = {
     { NULL,           APPLICATION_UNKNOWN }	/* this one must be last! */
 };
 
+/*
+ * Mapping of names of CTE types in mhbuild directives
+ */
+static struct k2v EncodingType[] = {
+    { "8bit",			CE_8BIT },
+    { "qp",			CE_QUOTED },
+    { "q-p",			CE_QUOTED },
+    { "quoted-printable",	CE_QUOTED },
+    { "b64",			CE_BASE64 },
+    { "base64",			CE_BASE64 },
+    { NULL,			0 },
+};
+
 
 /* mhcachesbr.c */
 int find_cache (CT, int, int *, char *, char *, int);
@@ -88,19 +103,18 @@ int type_ok (CT, int);
 void content_error (char *, CT, char *, ...);
 
 /* mhfree.c */
-void free_content (CT);
 void free_encoding (CT, int);
 
 /*
  * static prototypes
  */
 static CT get_content (FILE *, char *, int);
-static int get_comment (CT, unsigned char **, int);
+static int get_comment (const char *, const char *, char **, char **);
 
 static int InitGeneric (CT);
 static int InitText (CT);
 static int InitMultiPart (CT);
-static void reverse_parts (CT);
+void reverse_parts (CT);
 static int InitMessage (CT);
 static int InitApplication (CT);
 static int init_encoding (CT, OpenCEFunc);
@@ -118,6 +132,13 @@ static int openFTP (CT, char **);
 static int InitMail (CT);
 static int openMail (CT, char **);
 static int readDigest (CT, char *);
+static int get_leftover_mp_content (CT, int);
+static int InitURL (CT);
+static int openURL (CT, char **);
+static size_t param_len(PM, int, size_t, int *);
+static size_t encode_param(PM, char *, size_t, size_t, size_t, int);
+static size_t normal_param(PM, char *, size_t, size_t, size_t);
+static int get_dispo (char *, CT, int);
 
 struct str2init str2cts[] = {
     { "application", CT_APPLICATION, InitApplication },
@@ -152,6 +173,7 @@ struct str2init str2methods[] = {
     { "ftp",         0,	InitFTP },
     { "local-file",  0,	InitFile },
     { "mail-server", 0,	InitMail },
+    { "url",         0, InitURL },
     { NULL,          0, NULL }
 };
 
@@ -189,23 +211,23 @@ parse_mime (char *file)
     if ((is_stdin = !(strcmp (file, "-")))) {
         char *tfile = m_mktemp2(NULL, invo_name, NULL, &fp);
         if (tfile == NULL) {
-            advise("mhparse", "unable to create temporary file");
+            advise("mhparse", "unable to create temporary file in %s",
+		   get_temp_dir());
             return NULL;
         }
 	file = add (tfile, NULL);
-	chmod (file, 0600);
 
 	while (fgets (buffer, sizeof(buffer), stdin))
 	    fputs (buffer, fp);
 	fflush (fp);
 
 	if (ferror (stdin)) {
-	    unlink (file);
+	    (void) m_unlink (file);
 	    advise ("stdin", "error reading");
 	    return NULL;
 	}
 	if (ferror (fp)) {
-	    unlink (file);
+	    (void) m_unlink (file);
 	    advise (file, "error writing");
 	    return NULL;
 	}
@@ -217,7 +239,7 @@ parse_mime (char *file)
 
     if (!(ct = get_content (fp, file, 1))) {
 	if (is_stdin)
-	    unlink (file);
+	    (void) m_unlink (file);
 	advise (NULL, "unable to decode %s", file);
 	return NULL;
     }
@@ -262,6 +284,7 @@ get_content (FILE *in, char *file, int toplevel)
     char *np, *vp;
     CT ct;
     HF hp;
+    m_getfld_state_t gstate = 0;
 
     /* allocate the content structure */
     if (!(ct = (CT) calloc (1, sizeof(*ct))))
@@ -275,12 +298,12 @@ get_content (FILE *in, char *file, int toplevel)
      * Parse the header fields for this
      * content into a linked list.
      */
-    for (compnum = 1, state = FLD;;) {
+    m_getfld_track_filepos (&gstate, in);
+    for (compnum = 1;;) {
 	int bufsz = sizeof buf;
-	switch (state = m_getfld (state, name, buf, &bufsz, in)) {
+	switch (state = m_getfld (&gstate, name, buf, &bufsz, in)) {
 	case FLD:
 	case FLDPLUS:
-	case FLDEOF:
 	    compnum++;
 
 	    /* get copies of the buffers */
@@ -290,22 +313,18 @@ get_content (FILE *in, char *file, int toplevel)
 	    /* if necessary, get rest of field */
 	    while (state == FLDPLUS) {
 		bufsz = sizeof buf;
-		state = m_getfld (state, name, buf, &bufsz, in);
+		state = m_getfld (&gstate, name, buf, &bufsz, in);
 		vp = add (buf, vp);	/* add to previous value */
 	    }
 
 	    /* Now add the header data to the list */
 	    add_header (ct, np, vp);
 
-	    /* continue, if this isn't the last header field */
-	    if (state != FLDEOF) {
-		ct->c_begin = ftell (in) + 1;
-		continue;
-	    }
-	    /* else fall... */
+	    /* continue, to see if this isn't the last header field */
+	    ct->c_begin = ftell (in) + 1;
+	    continue;
 
 	case BODY:
-	case BODYEOF:
 	    ct->c_begin = ftell (in) - strlen (buf);
 	    break;
 
@@ -324,6 +343,7 @@ get_content (FILE *in, char *file, int toplevel)
 	/* break out of the loop */
 	break;
     }
+    m_getfld_state_destroy (&gstate);
 
     /*
      * Read the content headers.  We will parse the
@@ -335,10 +355,9 @@ get_content (FILE *in, char *file, int toplevel)
     hp = ct->c_first_hf;	/* start at first header field */
     while (hp) {
 	/* Get MIME-Version field */
-	if (!mh_strcasecmp (hp->name, VRSN_FIELD)) {
+	if (!strcasecmp (hp->name, VRSN_FIELD)) {
 	    int ucmp;
-	    char c;
-	    unsigned char *cp, *dp;
+	    char c, *cp, *dp;
 
 	    if (ct->c_vrsn) {
 		advise (NULL, "message %s has multiple %s: fields",
@@ -350,32 +369,33 @@ get_content (FILE *in, char *file, int toplevel)
 	    /* Now, cleanup this field */
 	    cp = ct->c_vrsn;
 
-	    while (isspace (*cp))
+	    while (isspace ((unsigned char) *cp))
 		cp++;
 	    for (dp = strchr(cp, '\n'); dp; dp = strchr(dp, '\n'))
 		*dp++ = ' ';
 	    for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)
-		if (!isspace (*dp))
+		if (!isspace ((unsigned char) *dp))
 		    break;
 	    *++dp = '\0';
 	    if (debugsw)
 		fprintf (stderr, "%s: %s\n", VRSN_FIELD, cp);
 
-	    if (*cp == '(' && get_comment (ct, &cp, 0) == NOTOK)
+	    if (*cp == '('  &&
+                get_comment (ct->c_file, VRSN_FIELD, &cp, NULL) == NOTOK)
 		goto out;
 
 	    for (dp = cp; istoken (*dp); dp++)
 		continue;
 	    c = *dp;
 	    *dp = '\0';
-	    ucmp = !mh_strcasecmp (cp, VRSN_VALUE);
+	    ucmp = !strcasecmp (cp, VRSN_VALUE);
 	    *dp = c;
 	    if (!ucmp) {
 		admonish (NULL, "message %s has unknown value for %s: field (%s)",
 		ct->c_file, VRSN_FIELD, cp);
 	    }
 	}
-	else if (!mh_strcasecmp (hp->name, TYPE_FIELD)) {
+	else if (!strcasecmp (hp->name, TYPE_FIELD)) {
 	/* Get Content-Type field */
 	    struct str2init *s2i;
 	    CI ci = &ct->c_ctinfo;
@@ -396,17 +416,16 @@ get_content (FILE *in, char *file, int toplevel)
 	     * flag for this content type.
 	     */
 	    for (s2i = str2cts; s2i->si_key; s2i++)
-		if (!mh_strcasecmp (ci->ci_type, s2i->si_key))
+		if (!strcasecmp (ci->ci_type, s2i->si_key))
 		    break;
 	    if (!s2i->si_key && !uprf (ci->ci_type, "X-"))
 		s2i++;
 	    ct->c_type = s2i->si_val;
 	    ct->c_ctinitfnx = s2i->si_init;
 	}
-	else if (!mh_strcasecmp (hp->name, ENCODING_FIELD)) {
+	else if (!strcasecmp (hp->name, ENCODING_FIELD)) {
 	/* Get Content-Transfer-Encoding field */
-	    char c;
-	    unsigned char *cp, *dp;
+	    char c, *cp, *dp;
 	    struct str2init *s2i;
 
 	    /*
@@ -422,7 +441,7 @@ get_content (FILE *in, char *file, int toplevel)
 	    /* get copy of this field */
 	    ct->c_celine = cp = add (hp->value, NULL);
 
-	    while (isspace (*cp))
+	    while (isspace ((unsigned char) *cp))
 		cp++;
 	    for (dp = cp; istoken (*dp); dp++)
 		continue;
@@ -434,7 +453,7 @@ get_content (FILE *in, char *file, int toplevel)
 	     * for this transfer encoding.
 	     */
 	    for (s2i = str2ces; s2i->si_key; s2i++)
-		if (!mh_strcasecmp (cp, s2i->si_key))
+		if (!strcasecmp (cp, s2i->si_key))
 		    break;
 	    if (!s2i->si_key && !uprf (cp, "X-"))
 		s2i++;
@@ -445,10 +464,9 @@ get_content (FILE *in, char *file, int toplevel)
 	    if (s2i->si_init && (*s2i->si_init) (ct) == NOTOK)
 		goto out;
 	}
-	else if (!mh_strcasecmp (hp->name, MD5_FIELD)) {
+	else if (!strcasecmp (hp->name, MD5_FIELD)) {
 	/* Get Content-MD5 field */
-	    unsigned char *cp, *dp;
-	    char *ep;
+	    char *cp, *dp, *ep;
 
 	    if (!checksw)
 		goto next_header;
@@ -461,23 +479,24 @@ get_content (FILE *in, char *file, int toplevel)
 
 	    ep = cp = add (hp->value, NULL);	/* get a copy */
 
-	    while (isspace (*cp))
+	    while (isspace ((unsigned char) *cp))
 		cp++;
 	    for (dp = strchr(cp, '\n'); dp; dp = strchr(dp, '\n'))
 		*dp++ = ' ';
 	    for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)
-		if (!isspace (*dp))
+		if (!isspace ((unsigned char) *dp))
 		    break;
 	    *++dp = '\0';
 	    if (debugsw)
 		fprintf (stderr, "%s: %s\n", MD5_FIELD, cp);
 
-	    if (*cp == '(' && get_comment (ct, &cp, 0) == NOTOK) {
+	    if (*cp == '('  &&
+                get_comment (ct->c_file, MD5_FIELD, &cp, NULL) == NOTOK) {
 		free (ep);
 		goto out;
 	    }
 
-	    for (dp = cp; *dp && !isspace (*dp); dp++)
+	    for (dp = cp; *dp && !isspace ((unsigned char) *dp); dp++)
 		continue;
 	    *dp = '\0';
 
@@ -485,17 +504,18 @@ get_content (FILE *in, char *file, int toplevel)
 	    free (ep);
 	    ct->c_digested++;
 	}
-	else if (!mh_strcasecmp (hp->name, ID_FIELD)) {
+	else if (!strcasecmp (hp->name, ID_FIELD)) {
 	/* Get Content-ID field */
 	    ct->c_id = add (hp->value, ct->c_id);
 	}
-	else if (!mh_strcasecmp (hp->name, DESCR_FIELD)) {
+	else if (!strcasecmp (hp->name, DESCR_FIELD)) {
 	/* Get Content-Description field */
 	    ct->c_descr = add (hp->value, ct->c_descr);
 	}
-	else if (!mh_strcasecmp (hp->name, DISPO_FIELD)) {
+	else if (!strcasecmp (hp->name, DISPO_FIELD)) {
 	/* Get Content-Disposition field */
-	    ct->c_dispo = add (hp->value, ct->c_dispo);
+	    if (get_dispo(hp->value, ct, 0) == NOTOK)
+		goto out;
 	}
 
 next_header:
@@ -580,7 +600,7 @@ add_header (CT ct, char *name, char *value)
    filename="foo".  If it doesn't and value does, use value from
    that. */
 static char *
-incl_name_value (unsigned char *buf, char *name, char *value) {
+incl_name_value (char *buf, char *name, char *value) {
     char *newbuf = buf;
 
     /* Assume that name is non-null. */
@@ -589,12 +609,11 @@ incl_name_value (unsigned char *buf, char *name, char *value) {
 
 	if (! strstr (buf, name_plus_equal)) {
 	    char *insertion;
-	    unsigned char *cp;
-	    char *prefix, *suffix;
+	    char *cp, *prefix, *suffix;
 
 	    /* Trim trailing space, esp. newline. */
 	    for (cp = &buf[strlen (buf) - 1];
-		 cp >= buf && isspace (*cp);
+		 cp >= buf && isspace ((unsigned char) *cp);
 		 --cp) {
 		*cp = '\0';
 	    }
@@ -660,21 +679,19 @@ extract_name_value (char *name_suffix, char *value) {
  * directives.  Fills in the information of the CTinfo structure.
  */
 int
-get_ctinfo (unsigned char *cp, CT ct, int magic)
+get_ctinfo (char *cp, CT ct, int magic)
 {
-    int	i;
-    unsigned char *dp;
-    char **ap, **ep;
+    char *dp;
     char c;
     CI ci;
+    int status;
 
     ci = &ct->c_ctinfo;
-    i = strlen (invo_name) + 2;
 
     /* store copy of Content-Type line */
     cp = ct->c_ctline = add (cp, NULL);
 
-    while (isspace (*cp))	/* trim leading spaces */
+    while (isspace ((unsigned char) *cp))	/* trim leading spaces */
 	cp++;
 
     /* change newlines to spaces */
@@ -683,14 +700,15 @@ get_ctinfo (unsigned char *cp, CT ct, int magic)
 
     /* trim trailing spaces */
     for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)
-	if (!isspace (*dp))
+	if (!isspace ((unsigned char) *dp))
 	    break;
     *++dp = '\0';
 
     if (debugsw)
 	fprintf (stderr, "%s: %s\n", TYPE_FIELD, cp);
 
-    if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
+    if (*cp == '(' && get_comment (ct->c_file, TYPE_FIELD, &cp,
+    				   &ci->ci_comment) == NOTOK)
 	return NOTOK;
 
     for (dp = cp; istoken (*dp); dp++)
@@ -707,13 +725,14 @@ get_ctinfo (unsigned char *cp, CT ct, int magic)
 
     /* down case the content type string */
     for (dp = ci->ci_type; *dp; dp++)
-	if (isalpha(*dp) && isupper (*dp))
-	    *dp = tolower (*dp);
+	if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
+	    *dp = tolower ((unsigned char) *dp);
 
-    while (isspace (*cp))
+    while (isspace ((unsigned char) *cp))
 	cp++;
 
-    if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
+    if (*cp == '(' && get_comment (ct->c_file, TYPE_FIELD, &cp,
+    				   &ci->ci_comment) == NOTOK)
 	return NOTOK;
 
     if (*cp != '/') {
@@ -723,10 +742,11 @@ get_ctinfo (unsigned char *cp, CT ct, int magic)
     }
 
     cp++;
-    while (isspace (*cp))
+    while (isspace ((unsigned char) *cp))
 	cp++;
 
-    if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
+    if (*cp == '(' && get_comment (ct->c_file, TYPE_FIELD, &cp,
+    				   &ci->ci_comment) == NOTOK)
 	return NOTOK;
 
     for (dp = cp; istoken (*dp); dp++)
@@ -744,111 +764,21 @@ get_ctinfo (unsigned char *cp, CT ct, int magic)
 
     /* down case the content subtype string */
     for (dp = ci->ci_subtype; *dp; dp++)
-	if (isalpha(*dp) && isupper (*dp))
-	    *dp = tolower (*dp);
+	if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
+	    *dp = tolower ((unsigned char) *dp);
 
 magic_skip:
-    while (isspace (*cp))
+    while (isspace ((unsigned char) *cp))
 	cp++;
 
-    if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
+    if (*cp == '(' && get_comment (ct->c_file, TYPE_FIELD, &cp,
+    				   &ci->ci_comment) == NOTOK)
 	return NOTOK;
 
-    /*
-     * Parse attribute/value pairs given with Content-Type
-     */
-    ep = (ap = ci->ci_attrs) + NPARMS;
-    while (*cp == ';') {
-	char *vp;
-	unsigned char *up;
-
-	if (ap >= ep) {
-	    advise (NULL,
-		    "too many parameters in message %s's %s: field (%d max)",
-		    ct->c_file, TYPE_FIELD, NPARMS);
-	    return NOTOK;
-	}
-
-	cp++;
-	while (isspace (*cp))
-	    cp++;
-
-	if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
-	    return NOTOK;
-
-	if (*cp == 0) {
-	    advise (NULL,
-		    "extraneous trailing ';' in message %s's %s: parameter list",
-		    ct->c_file, TYPE_FIELD);
-	    return OK;
-	}
-
-	/* down case the attribute name */
-	for (dp = cp; istoken (*dp); dp++)
-	    if (isalpha(*dp) && isupper (*dp))
-		*dp = tolower (*dp);
-
-	for (up = dp; isspace (*dp);)
-	    dp++;
-	if (dp == cp || *dp != '=') {
-	    advise (NULL,
-		    "invalid parameter in message %s's %s: field\n%*.*sparameter %s (error detected at offset %d)",
-		    ct->c_file, TYPE_FIELD, i, i, "", cp, dp - cp);
-	    return NOTOK;
-	}
-
-	vp = (*ap = add (cp, NULL)) + (up - cp);
-	*vp = '\0';
-	for (dp++; isspace (*dp);)
-	    dp++;
-
-	/* now add the attribute value */
-	ci->ci_values[ap - ci->ci_attrs] = vp = *ap + (dp - cp);
-
-	if (*dp == '"') {
-	    for (cp = ++dp, dp = vp;;) {
-		switch (c = *cp++) {
-		    case '\0':
-bad_quote:
-		        advise (NULL,
-				"invalid quoted-string in message %s's %s: field\n%*.*s(parameter %s)",
-				ct->c_file, TYPE_FIELD, i, i, "", *ap);
-			return NOTOK;
-
-		    case '\\':
-			*dp++ = c;
-			if ((c = *cp++) == '\0')
-			    goto bad_quote;
-			/* else fall... */
-
-		    default:
-    			*dp++ = c;
-    			continue;
-
-		    case '"':
-			*dp = '\0';
-			break;
-		}
-		break;
-	    }
-	} else {
-	    for (cp = dp, dp = vp; istoken (*cp); cp++, dp++)
-		continue;
-	    *dp = '\0';
-	}
-	if (!*vp) {
-	    advise (NULL,
-		    "invalid parameter in message %s's %s: field\n%*.*s(parameter %s)",
-		    ct->c_file, TYPE_FIELD, i, i, "", *ap);
-	    return NOTOK;
-	}
-	ap++;
-
-	while (isspace (*cp))
-	    cp++;
-
-	if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
-	    return NOTOK;
+    if ((status = parse_header_attrs (ct->c_file, TYPE_FIELD, &cp,
+    				      &ci->ci_first_pm, &ci->ci_last_pm,
+				      &ci->ci_comment)) != OK) {
+	return status == NOTOK ? NOTOK : OK;
     }
 
     /*
@@ -872,7 +802,7 @@ bad_quote:
 	*dp++ = c;
 	cp = dp;
 
-	while (isspace (*cp))
+	while (isspace ((unsigned char) *cp))
 	    cp++;
     }
 
@@ -899,7 +829,7 @@ bad_quote:
 	*dp++ = c;
 	cp = dp;
 
-	while (isspace (*cp))
+	while (isspace ((unsigned char) *cp))
 	    cp++;
     }
 
@@ -907,7 +837,7 @@ bad_quote:
      * Get any {Content-Disposition} given in buffer.
      */
     if (magic && *cp == '{') {
-        ct->c_dispo = ++cp;
+        ++cp;
 	for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)
 	    if (*dp == '}')
 		break;
@@ -919,14 +849,55 @@ bad_quote:
 	
 	c = *dp;
 	*dp = '\0';
-	if (*ct->c_dispo)
-	    ct->c_dispo = concat (ct->c_dispo, "\n", NULL);
-	else
-	    ct->c_dispo = NULL;
+
+	if (get_dispo(cp, ct, 1) != OK)
+	    return NOTOK;
+
 	*dp++ = c;
 	cp = dp;
 
-	while (isspace (*cp))
+	while (isspace ((unsigned char) *cp))
+	    cp++;
+    }
+
+    /*
+     * Get any extension directives (right now just the content transfer
+     * encoding, but maybe others) that we care about.
+     */
+
+    if (magic && *cp == '*') {
+    	/*
+	 * See if it's a CTE we match on
+	 */
+	struct k2v *kv;
+
+	dp = ++cp;
+	while (*cp != '\0' && ! isspace((unsigned char) *cp))
+	    cp++;
+
+	if (dp == cp) {
+	    advise (NULL, "invalid null transfer encoding specification");
+	    return NOTOK;
+	}
+
+	if (*cp != '\0')
+	    *cp++ = '\0';
+
+	ct->c_reqencoding = CE_UNKNOWN;
+
+	for (kv = EncodingType; kv->kv_key; kv++) {
+	    if (strcasecmp(kv->kv_key, dp) == 0) {
+		ct->c_reqencoding = kv->kv_value;
+		break;
+	    }
+	}
+
+	if (ct->c_reqencoding == CE_UNKNOWN) {
+	    advise (NULL, "invalid CTE specification: \"%s\"", dp);
+	    return NOTOK;
+	}
+
+	while (isspace ((unsigned char) *cp))
 	    cp++;
     }
 
@@ -952,24 +923,95 @@ bad_quote:
         }
 	else
 	    advise (NULL,
-		    "extraneous information in message %s's %s: field\n%*.*s(%s)",
-                    ct->c_file, TYPE_FIELD, i, i, "", cp);
+		    "extraneous information in message %s's %s: field\n%*s(%s)",
+                    ct->c_file, TYPE_FIELD, strlen(invo_name) + 2, "", cp);
+    }
+
+    return OK;
+}
+
+
+/*
+ * Parse out a Content-Disposition header.  A lot of this is cribbed from
+ * get_ctinfo().
+ */
+static int
+get_dispo (char *cp, CT ct, int buildflag)
+{
+    char *dp, *dispoheader;
+    char c;
+    int status;
+
+    /*
+     * Save the whole copy of the Content-Disposition header, unless we're
+     * processing a mhbuild directive.  A NULL c_dispo will be a flag to
+     * mhbuild that the disposition header needs to be generated at that
+     * time.
+     */
+
+    dispoheader = cp = add(cp, NULL);
+
+    while (isspace ((unsigned char) *cp))	/* trim leading spaces */
+	cp++;
+
+    /* change newlines to spaces */
+    for (dp = strchr(cp, '\n'); dp; dp = strchr(dp, '\n'))
+	*dp++ = ' ';
+
+    /* trim trailing spaces */
+    for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)
+	if (!isspace ((unsigned char) *dp))
+	    break;
+    *++dp = '\0';
+
+    if (debugsw)
+	fprintf (stderr, "%s: %s\n", DISPO_FIELD, cp);
+
+    if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) ==
+    							NOTOK) {
+	free(dispoheader);
+	return NOTOK;
+    }
+
+    for (dp = cp; istoken (*dp); dp++)
+	continue;
+    c = *dp, *dp = '\0';
+    ct->c_dispo_type = add (cp, NULL);	/* store disposition type */
+    *dp = c, cp = dp;
+
+    if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) == NOTOK)
+	return NOTOK;
+
+    if ((status = parse_header_attrs (ct->c_file, DISPO_FIELD, &cp,
+    				      &ct->c_dispo_first, &ct->c_dispo_last,
+				      NULL)) != OK) {
+	if (status == NOTOK) {
+	    free(dispoheader);
+	    return NOTOK;
+	}
+    } else if (*cp) {
+	advise (NULL,
+		"extraneous information in message %s's %s: field\n%*s(%s)",
+                    ct->c_file, DISPO_FIELD, strlen(invo_name) + 2, "", cp);
     }
 
+    if (buildflag)
+    	free(dispoheader);
+    else
+	ct->c_dispo = dispoheader;
+
     return OK;
 }
 
 
 static int
-get_comment (CT ct, unsigned char **ap, int istype)
+get_comment (const char *filename, const char *fieldname, char **ap,
+	     char **commentp)
 {
     int i;
-    char *bp;
-    unsigned char *cp;
+    char *bp, *cp;
     char c, buffer[BUFSIZ], *dp;
-    CI ci;
 
-    ci = &ct->c_ctinfo;
     cp = *ap;
     bp = buffer;
     cp++;
@@ -979,7 +1021,7 @@ get_comment (CT ct, unsigned char **ap, int istype)
 	case '\0':
 invalid:
 	advise (NULL, "invalid comment in message %s's %s: field",
-		ct->c_file, istype ? TYPE_FIELD : VRSN_FIELD);
+		filename, fieldname);
 	return NOTOK;
 
 	case '\\':
@@ -1006,16 +1048,16 @@ invalid:
     }
     *bp = '\0';
 
-    if (istype) {
-	if ((dp = ci->ci_comment)) {
-	    ci->ci_comment = concat (dp, " ", buffer, NULL);
+    if (commentp) {
+	if ((dp = *commentp)) {
+	    *commentp = concat (dp, " ", buffer, NULL);
 	    free (dp);
 	} else {
-	    ci->ci_comment = add (buffer, NULL);
+	    *commentp = add (buffer, NULL);
 	}
     }
 
-    while (isspace (*cp))
+    while (isspace ((unsigned char) *cp))
 	cp++;
 
     *ap = cp;
@@ -1048,7 +1090,8 @@ InitText (CT ct)
 {
     char buffer[BUFSIZ];
     char *chset = NULL;
-    char **ap, **ep, *cp;
+    char *cp;
+    PM pm;
     struct k2v *kv;
     struct text *t;
     CI ci = &ct->c_ctinfo;
@@ -1059,7 +1102,7 @@ InitText (CT ct)
 
     /* match subtype */
     for (kv = SubText; kv->kv_key; kv++)
-	if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key))
+	if (!strcasecmp (ci->ci_subtype, kv->kv_key))
 	    break;
     ct->c_subtype = kv->kv_value;
 
@@ -1069,13 +1112,13 @@ InitText (CT ct)
     ct->c_ctparams = (void *) t;
 
     /* scan for charset parameter */
-    for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++)
-	if (!mh_strcasecmp (*ap, "charset"))
+    for (pm = ci->ci_first_pm; pm; pm = pm->pm_next)
+	if (!strcasecmp (pm->pm_name, "charset"))
 	    break;
 
     /* check if content specified a character set */
-    if (*ap) {
-	chset = *ep;
+    if (pm) {
+	chset = pm->pm_value;
 	t->tx_charset = CHARSET_SPECIFIED;
     } else {
 	t->tx_charset = CHARSET_UNSPECIFIED;
@@ -1107,8 +1150,8 @@ InitMultiPart (CT ct)
 {
     int	inout;
     long last, pos;
-    unsigned char *cp, *dp;
-    char **ap, **ep;
+    char *cp, *dp;
+    PM pm;
     char *bp, buffer[BUFSIZ];
     struct multipart *m;
     struct k2v *kv;
@@ -1121,17 +1164,30 @@ InitMultiPart (CT ct)
      * The encoding for multipart messages must be either
      * 7bit, 8bit, or binary (per RFC2045).
      */
-    if (ct->c_encoding != CE_7BIT && ct->c_encoding != CE_8BIT
-	&& ct->c_encoding != CE_BINARY) {
+    if (! skip_mp_cte_check  &&  ct->c_encoding != CE_7BIT  &&
+        ct->c_encoding != CE_8BIT  &&  ct->c_encoding != CE_BINARY) {
+	/* Copy the Content-Transfer-Encoding header field body so we can
+	   remove any trailing whitespace and leading blanks from it. */
+	char *cte = add (ct->c_celine ? ct->c_celine : "(null)", NULL);
+
+	bp = cte + strlen (cte) - 1;
+	while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';
+	for (bp = cte; *bp && isblank ((unsigned char) *bp); ++bp) continue;
+
 	admonish (NULL,
-		  "\"%s/%s\" type in message %s must be encoded in 7bit, 8bit, or binary",
-		  ci->ci_type, ci->ci_subtype, ct->c_file);
+		  "\"%s/%s\" type in message %s must be encoded in\n"
+		  "7bit, 8bit, or binary, per RFC 2045 (6.4).  One workaround "
+		  "is to\nmanually edit the file and change the \"%s\"\n"
+		  "Content-Transfer-Encoding to one of those.  For now",
+		  ci->ci_type, ci->ci_subtype, ct->c_file, bp);
+	free (cte);
+
 	return NOTOK;
     }
 
     /* match subtype */
     for (kv = SubMultiPart; kv->kv_key; kv++)
-	if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key))
+	if (!strcasecmp (ci->ci_subtype, kv->kv_key))
 	    break;
     ct->c_subtype = kv->kv_value;
 
@@ -1140,15 +1196,15 @@ InitMultiPart (CT ct)
      * required for multipart messages.
      */
     bp = 0;
-    for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
-	if (!mh_strcasecmp (*ap, "boundary")) {
-	    bp = *ep;
+    for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
+	if (!strcasecmp (pm->pm_name, "boundary")) {
+	    bp = pm->pm_value;
 	    break;
 	}
     }
 
     /* complain if boundary parameter is missing */
-    if (!*ap) {
+    if (!pm) {
 	advise (NULL,
 		"a \"boundary\" parameter is mandatory for \"%s/%s\" type in message %s's %s: field",
 		ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
@@ -1161,7 +1217,7 @@ InitMultiPart (CT ct)
     ct->c_ctparams = (void *) m;
 
     /* check if boundary parameter contains only whitespace characters */
-    for (cp = bp; isspace (*cp); cp++)
+    for (cp = bp; isspace ((unsigned char) *cp); cp++)
 	continue;
     if (!*cp) {
 	advise (NULL, "invalid \"boundary\" parameter for \"%s/%s\" type in message %s's %s: field",
@@ -1171,7 +1227,7 @@ InitMultiPart (CT ct)
 
     /* remove trailing whitespace from boundary parameter */
     for (cp = bp, dp = cp + strlen (cp) - 1; dp > cp; dp--)
-	if (!isspace (*dp))
+	if (!isspace ((unsigned char) *dp))
 	    break;
     *++dp = '\0';
 
@@ -1234,7 +1290,11 @@ end_part:
 	}
     }
 
-    advise (NULL, "bogus multipart content in message %s", ct->c_file);
+    if (! suppress_bogus_mp_content_warning) {
+        advise (NULL, "bogus multipart content in message %s", ct->c_file);
+    }
+    bogus_mp_content = 1;
+
     if (!inout && part) {
 	p = part->mp_part;
 	p->c_end = ct->c_end;
@@ -1286,6 +1346,9 @@ last_part:
 	}
     }
 
+    get_leftover_mp_content (ct, 1);
+    get_leftover_mp_content (ct, 0);
+
     fclose (ct->c_fp);
     ct->c_fp = NULL;
     return OK;
@@ -1293,48 +1356,23 @@ last_part:
 
 
 /*
- * reverse the order of the parts of a multipart
+ * reverse the order of the parts of a multipart/alternative
  */
 
-static void
+void
 reverse_parts (CT ct)
 {
-    int i;
-    struct multipart *m;
-    struct part **base, **bmp, **next, *part;
-
-    m = (struct multipart *) ct->c_ctparams;
-
-    /* if only one part, just return */
-    if (!m->mp_parts || !m->mp_parts->mp_next)
-	return;
-
-    /* count number of parts */
-    i = 0;
-    for (part = m->mp_parts; part; part = part->mp_next)
-	i++;
-
-    /* allocate array of pointers to the parts */
-    if (!(base = (struct part **) calloc ((size_t) (i + 1), sizeof(*base))))
-	adios (NULL, "out of memory");
-    bmp = base;
-
-    /* point at all the parts */
-    for (part = m->mp_parts; part; part = part->mp_next)
-	*bmp++ = part;
-    *bmp = NULL;
+    struct multipart *m = (struct multipart *) ct->c_ctparams;
+    struct part *part;
+    struct part *next;
 
-    /* reverse the order of the parts */
-    next = &m->mp_parts;
-    for (bmp--; bmp >= base; bmp--) {
-	part = *bmp;
-	*next = part;
-	next = &part->mp_next;
+    /* Reverse the order of its parts by walking the mp_parts list
+       and pushing each node to the front. */
+    for (part = m->mp_parts, m->mp_parts = NULL; part; part = next) {
+        next = part->mp_next;
+        part->mp_next = m->mp_parts;
+        m->mp_parts = part;
     }
-    *next = NULL;
-
-    /* free array of pointers */
-    free ((char *) base);
 }
 
 
@@ -1361,7 +1399,7 @@ InitMessage (CT ct)
 
     /* match subtype */
     for (kv = SubMessage; kv->kv_key; kv++)
-	if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key))
+	if (!strcasecmp (ci->ci_subtype, kv->kv_key))
 	    break;
     ct->c_subtype = kv->kv_value;
 
@@ -1371,7 +1409,7 @@ InitMessage (CT ct)
 
 	case MESSAGE_PARTIAL:
 	    {
-		char **ap, **ep;
+		PM pm;
 		struct partial *p;
 
 		if ((p = (struct partial *) calloc (1, sizeof(*p))) == NULL)
@@ -1379,25 +1417,25 @@ InitMessage (CT ct)
 		ct->c_ctparams = (void *) p;
 
 		/* scan for parameters "id", "number", and "total" */
-		for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
-		    if (!mh_strcasecmp (*ap, "id")) {
-			p->pm_partid = add (*ep, NULL);
+		for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
+		    if (!strcasecmp (pm->pm_name, "id")) {
+			p->pm_partid = add (pm->pm_value, NULL);
 			continue;
 		    }
-		    if (!mh_strcasecmp (*ap, "number")) {
-			if (sscanf (*ep, "%d", &p->pm_partno) != 1
+		    if (!strcasecmp (pm->pm_name, "number")) {
+			if (sscanf (pm->pm_value, "%d", &p->pm_partno) != 1
 			        || p->pm_partno < 1) {
 invalid_param:
 			    advise (NULL,
 				    "invalid %s parameter for \"%s/%s\" type in message %s's %s field",
-				    *ap, ci->ci_type, ci->ci_subtype,
+				    pm->pm_name, ci->ci_type, ci->ci_subtype,
 				    ct->c_file, TYPE_FIELD);
 			    return NOTOK;
 			}
 			continue;
 		    }
-		    if (!mh_strcasecmp (*ap, "total")) {
-			if (sscanf (*ep, "%d", &p->pm_maxno) != 1
+		    if (!strcasecmp (pm->pm_name, "total")) {
+			if (sscanf (pm->pm_value, "%d", &p->pm_maxno) != 1
 			        || p->pm_maxno < 1)
 			    goto invalid_param;
 			continue;
@@ -1443,6 +1481,7 @@ invalid_param:
 		e->eb_parent = ct;
 		e->eb_content = p;
 		p->c_ctexbody = e;
+		p->c_ceopenfnx = NULL;
 		if ((exresult = params_external (ct, 0)) != NOTOK
 		        && p->c_ceopenfnx == openMail) {
 		    int	cc, size;
@@ -1511,20 +1550,21 @@ no_body:
 int
 params_external (CT ct, int composing)
 {
-    char **ap, **ep;
+    PM pm;
     struct exbody *e = (struct exbody *) ct->c_ctparams;
     CI ci = &ct->c_ctinfo;
 
-    for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
-	if (!mh_strcasecmp (*ap, "access-type")) {
+    ct->c_ceopenfnx = NULL;
+    for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
+	if (!strcasecmp (pm->pm_name, "access-type")) {
 	    struct str2init *s2i;
 	    CT p = e->eb_content;
 
 	    for (s2i = str2methods; s2i->si_key; s2i++)
-		if (!mh_strcasecmp (*ep, s2i->si_key))
+		if (!strcasecmp (pm->pm_value, s2i->si_key))
 		    break;
 	    if (!s2i->si_key) {
-		e->eb_access = *ep;
+		e->eb_access = pm->pm_value;
 		e->eb_flags = NOTOK;
 		p->c_encoding = CE_EXTERNAL;
 		continue;
@@ -1538,40 +1578,57 @@ params_external (CT ct, int composing)
 		return NOTOK;
 	    continue;
 	}
-	if (!mh_strcasecmp (*ap, "name")) {
-	    e->eb_name = *ep;
+	if (!strcasecmp (pm->pm_name, "name")) {
+	    e->eb_name = pm->pm_value;
 	    continue;
 	}
-	if (!mh_strcasecmp (*ap, "permission")) {
-	    e->eb_permission = *ep;
+	if (!strcasecmp (pm->pm_name, "permission")) {
+	    e->eb_permission = pm->pm_value;
 	    continue;
 	}
-	if (!mh_strcasecmp (*ap, "site")) {
-	    e->eb_site = *ep;
+	if (!strcasecmp (pm->pm_name, "site")) {
+	    e->eb_site = pm->pm_value;
 	    continue;
 	}
-	if (!mh_strcasecmp (*ap, "directory")) {
-	    e->eb_dir = *ep;
+	if (!strcasecmp (pm->pm_name, "directory")) {
+	    e->eb_dir = pm->pm_value;
 	    continue;
 	}
-	if (!mh_strcasecmp (*ap, "mode")) {
-	    e->eb_mode = *ep;
+	if (!strcasecmp (pm->pm_name, "mode")) {
+	    e->eb_mode = pm->pm_value;
 	    continue;
 	}
-	if (!mh_strcasecmp (*ap, "size")) {
-	    sscanf (*ep, "%lu", &e->eb_size);
+	if (!strcasecmp (pm->pm_name, "size")) {
+	    sscanf (pm->pm_value, "%lu", &e->eb_size);
 	    continue;
 	}
-	if (!mh_strcasecmp (*ap, "server")) {
-	    e->eb_server = *ep;
+	if (!strcasecmp (pm->pm_name, "server")) {
+	    e->eb_server = pm->pm_value;
 	    continue;
 	}
-	if (!mh_strcasecmp (*ap, "subject")) {
-	    e->eb_subject = *ep;
+	if (!strcasecmp (pm->pm_name, "subject")) {
+	    e->eb_subject = pm->pm_value;
+	    continue;
+	}
+	if (!strcasecmp (pm->pm_name, "url")) {
+	    /*
+	     * According to RFC 2017, we have to remove all whitespace from
+	     * the URL
+	     */
+
+	    char *u, *p = pm->pm_value;
+	    e->eb_url = u = mh_xmalloc(strlen(pm->pm_value) + 1);
+
+	    for (; *p != '\0'; p++) {
+	    	if (! isspace((unsigned char) *p))
+		    *u++ = *p;
+	    }
+
+	    *u = '\0';
 	    continue;
 	}
-	if (composing && !mh_strcasecmp (*ap, "body")) {
-	    e->eb_body = getcpy (*ep);
+	if (composing && !strcasecmp (pm->pm_name, "body")) {
+	    e->eb_body = getcpy (pm->pm_value);
 	    continue;
 	}
     }
@@ -1599,7 +1656,7 @@ InitApplication (CT ct)
 
     /* match subtype */
     for (kv = SubApplication; kv->kv_key; kv++)
-	if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key))
+	if (!strcasecmp (ci->ci_subtype, kv->kv_key))
 	    break;
     ct->c_subtype = kv->kv_value;
 
@@ -1614,12 +1671,6 @@ InitApplication (CT ct)
 static int
 init_encoding (CT ct, OpenCEFunc openfnx)
 {
-    CE ce;
-
-    if ((ce = (CE) calloc (1, sizeof(*ce))) == NULL)
-	adios (NULL, "out of memory");
-
-    ct->c_cefile     = ce;
     ct->c_ceopenfnx  = openfnx;
     ct->c_ceclosefnx = close_encoding;
     ct->c_cesizefnx  = size_encoding;
@@ -1631,10 +1682,7 @@ init_encoding (CT ct, OpenCEFunc openfnx)
 void
 close_encoding (CT ct)
 {
-    CE ce;
-
-    if (!(ce = ct->c_cefile))
-	return;
+    CE ce = &ct->c_cefile;
 
     if (ce->ce_fp) {
 	fclose (ce->ce_fp);
@@ -1649,12 +1697,9 @@ size_encoding (CT ct)
     int	fd;
     unsigned long size;
     char *file;
-    CE ce;
+    CE ce = &ct->c_cefile;
     struct stat st;
 
-    if (!(ce = ct->c_cefile))
-	return (ct->c_end - ct->c_begin);
-
     if (ce->ce_fp && fstat (fileno (ce->ce_fp), &st) != NOTOK)
 	return (long) st.st_size;
 
@@ -1717,17 +1762,15 @@ static int
 openBase64 (CT ct, char **file)
 {
     int	bitno, cc, digested;
-    int fd, len, skip, own_ct_fp = 0;
+    int fd, len, skip, own_ct_fp = 0, text = ct->c_type == CT_TEXT;
     uint32_t bits;
     unsigned char value, b;
-    unsigned char *cp, *ep;
-    char buffer[BUFSIZ];
+    char *cp, *ep, buffer[BUFSIZ];
     /* sbeck -- handle suffixes */
     CI ci;
-    CE ce;
+    CE ce = &ct->c_cefile;
     MD5_CTX mdContext;
 
-    ce = ct->c_cefile;
     if (ce->ce_fp) {
 	fseek (ce->ce_fp, 0L, SEEK_SET);
 	goto ready_to_go;
@@ -1742,7 +1785,6 @@ openBase64 (CT ct, char **file)
     }
 
     if (*file == NULL) {
-	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
 	ce->ce_unlink = 1;
     } else {
 	ce->ce_file = add (*file, NULL);
@@ -1760,19 +1802,22 @@ openBase64 (CT ct, char **file)
         cp = context_find (buffer);
     }
     if (cp != NULL && *cp != '\0') {
-        if (ce->ce_unlink) {
-            /* Temporary file already exists, so we rename to
-               version with extension. */
-            char *file_org = strdup(ce->ce_file);
-            ce->ce_file = add (cp, ce->ce_file);
-            if (rename(file_org, ce->ce_file)) {
-                adios (ce->ce_file, "unable to rename %s to ", file_org);
-            }
-            free(file_org);
-
-        } else {
-            ce->ce_file = add (cp, ce->ce_file);
-        }
+	if (ce->ce_unlink) {
+	    /* Create temporary file with filename extension. */
+	    if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
+		adios(NULL, "unable to create temporary file in %s",
+		      get_temp_dir());
+	    }
+	} else {
+	    ce->ce_file = add (cp, ce->ce_file);
+	}
+    } else if (*file == NULL) {
+	char *tempfile;
+	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	ce->ce_file = add (tempfile, NULL);
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
@@ -1817,13 +1862,13 @@ openBase64 (CT ct, char **file)
 	    for (ep = (cp = buffer) + cc; cp < ep; cp++) {
 		switch (*cp) {
 		default:
-		    if (isspace (*cp))
+		    if (isspace ((unsigned char) *cp))
 			break;
-		    if (skip || (*cp & 0x80)
-			|| (value = b642nib[*cp & 0x7f]) > 0x3f) {
+		    if (skip || (((unsigned char) *cp) & 0x80)
+			|| (value = b642nib[((unsigned char) *cp) & 0x7f]) > 0x3f) {
 			if (debugsw) {
 			    fprintf (stderr, "*cp=0x%x pos=%ld skip=%d\n",
-				*cp,
+				(unsigned char) *cp,
 				(long) (lseek (fd, (off_t) 0, SEEK_CUR) - (ep - cp)),
 				skip);
 			}
@@ -1836,17 +1881,20 @@ openBase64 (CT ct, char **file)
 test_end:
 		    if ((bitno -= 6) < 0) {
 		    	b = (bits >> 16) & 0xff;
-			putc ((char) b, ce->ce_fp);
+			if (!text || b != '\r')
+			    putc ((char) b, ce->ce_fp);
 			if (digested)
 			    MD5Update (&mdContext, &b, 1);
 			if (skip < 2) {
 			    b = (bits >> 8) & 0xff;
-			    putc ((char) b, ce->ce_fp);
+			    if (! text || b != '\r')
+				putc ((char) b, ce->ce_fp);
 			    if (digested)
 				MD5Update (&mdContext, &b, 1);
 			    if (skip < 1) {
 			    	b = bits & 0xff;
-				putc ((char) b, ce->ce_fp);
+				if (! text || b != '\r')
+				    putc ((char) b, ce->ce_fp);
 				if (digested)
 				    MD5Update (&mdContext, &b, 1);
 			    }
@@ -1954,15 +2002,14 @@ static int
 openQuoted (CT ct, char **file)
 {
     int	cc, digested, len, quoted, own_ct_fp = 0;
-    unsigned char *cp, *ep;
+    char *cp, *ep;
     char buffer[BUFSIZ];
     unsigned char mask;
-    CE ce;
+    CE ce = &ct->c_cefile;
     /* sbeck -- handle suffixes */
     CI ci;
     MD5_CTX mdContext;
 
-    ce = ct->c_cefile;
     if (ce->ce_fp) {
 	fseek (ce->ce_fp, 0L, SEEK_SET);
 	goto ready_to_go;
@@ -1977,7 +2024,6 @@ openQuoted (CT ct, char **file)
     }
 
     if (*file == NULL) {
-	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
 	ce->ce_unlink = 1;
     } else {
 	ce->ce_file = add (*file, NULL);
@@ -1995,19 +2041,22 @@ openQuoted (CT ct, char **file)
         cp = context_find (buffer);
     }
     if (cp != NULL && *cp != '\0') {
-        if (ce->ce_unlink) {
-            /* Temporary file already exists, so we rename to
-               version with extension. */
-            char *file_org = strdup(ce->ce_file);
-            ce->ce_file = add (cp, ce->ce_file);
-            if (rename(file_org, ce->ce_file)) {
-                adios (ce->ce_file, "unable to rename %s to ", file_org);
-            }
-            free(file_org);
-
-        } else {
-            ce->ce_file = add (cp, ce->ce_file);
-        }
+	if (ce->ce_unlink) {
+	    /* Create temporary file with filename extension. */
+	    if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
+		adios(NULL, "unable to create temporary file in %s",
+		      get_temp_dir());
+	    }
+	} else {
+	    ce->ce_file = add (cp, ce->ce_file);
+	}
+    } else if (*file == NULL) {
+	char *tempfile;
+	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	ce->ce_file = add (tempfile, NULL);
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
@@ -2046,7 +2095,7 @@ openQuoted (CT ct, char **file)
 	len -= cc;
 
 	for (ep = (cp = buffer) + cc - 1; cp <= ep; ep--)
-	    if (!isspace (*ep))
+	    if (!isspace ((unsigned char) *ep))
 		break;
 	*++ep = '\n', ep++;
 
@@ -2055,13 +2104,13 @@ openQuoted (CT ct, char **file)
 		/* in an escape sequence */
 		if (quoted == 1) {
 		    /* at byte 1 of an escape sequence */
-		    mask = hex2nib[*cp & 0x7f];
+		    mask = hex2nib[((unsigned char) *cp) & 0x7f];
 		    /* next is byte 2 */
 		    quoted = 2;
 		} else {
 		    /* at byte 2 of an escape sequence */
 		    mask <<= 4;
-		    mask |= hex2nib[*cp & 0x7f];
+		    mask |= hex2nib[((unsigned char) *cp) & 0x7f];
 		    putc (mask, ce->ce_fp);
 		    if (digested)
 			MD5Update (&mdContext, &mask, 1);
@@ -2088,7 +2137,8 @@ openQuoted (CT ct, char **file)
 		if (cp + 1 >= ep || cp + 2 >= ep) {
 		    /* We don't have 2 bytes left, so this is an invalid
 		     * escape sequence; just show the raw bytes (below). */
-		} else if (isxdigit (cp[1]) && isxdigit (cp[2])) {
+		} else if (isxdigit ((unsigned char) cp[1]) &&
+					isxdigit ((unsigned char) cp[2])) {
 		    /* Next 2 bytes are hex digits, making this a valid escape
 		     * sequence; let's decode it (above). */
 		    quoted = 1;
@@ -2184,9 +2234,8 @@ open7Bit (CT ct, char **file)
     /* sbeck -- handle suffixes */
     char *cp;
     CI ci;
-    CE ce;
+    CE ce = &ct->c_cefile;
 
-    ce = ct->c_cefile;
     if (ce->ce_fp) {
 	fseek (ce->ce_fp, 0L, SEEK_SET);
 	goto ready_to_go;
@@ -2201,7 +2250,6 @@ open7Bit (CT ct, char **file)
     }
 
     if (*file == NULL) {
-	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
 	ce->ce_unlink = 1;
     } else {
 	ce->ce_file = add (*file, NULL);
@@ -2219,19 +2267,22 @@ open7Bit (CT ct, char **file)
         cp = context_find (buffer);
     }
     if (cp != NULL && *cp != '\0') {
-        if (ce->ce_unlink) {
-            /* Temporary file already exists, so we rename to
-               version with extension. */
-            char *file_org = strdup(ce->ce_file);
-            ce->ce_file = add (cp, ce->ce_file);
-            if (rename(file_org, ce->ce_file)) {
-                adios (ce->ce_file, "unable to rename %s to ", file_org);
-            }
-            free(file_org);
-
-        } else {
-            ce->ce_file = add (cp, ce->ce_file);
-        }
+	if (ce->ce_unlink) {
+	    /* Create temporary file with filename extension. */
+	    if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
+		adios(NULL, "unable to create temporary file in %s",
+		      get_temp_dir());
+	    }
+	} else {
+	    ce->ce_file = add (cp, ce->ce_file);
+	}
+    } else if (*file == NULL) {
+	char *tempfile;
+	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	ce->ce_file = add (tempfile, NULL);
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
@@ -2240,28 +2291,18 @@ open7Bit (CT ct, char **file)
     }
 
     if (ct->c_type == CT_MULTIPART) {
-	char **ap, **ep;
 	CI ci = &ct->c_ctinfo;
+	char *buffer;
 
 	len = 0;
 	fprintf (ce->ce_fp, "%s: %s/%s", TYPE_FIELD, ci->ci_type, ci->ci_subtype);
 	len += strlen (TYPE_FIELD) + 2 + strlen (ci->ci_type)
 	    + 1 + strlen (ci->ci_subtype);
-	for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
-	    putc (';', ce->ce_fp);
-	    len++;
-
-	    snprintf (buffer, sizeof(buffer), "%s=\"%s\"", *ap, *ep);
+	buffer = output_params(len, ci->ci_first_pm, &len);
 
-	    if (len + 1 + (cc = strlen (buffer)) >= CPERLIN) {
-		fputs ("\n\t", ce->ce_fp);
-		len = 8;
-	    } else {
-		putc (' ', ce->ce_fp);
-		len++;
-	    }
-	    fprintf (ce->ce_fp, "%s", buffer);
-	    len += cc;
+	if (buffer) {
+	    fputs (buffer, ce->ce_fp);
+	    free(buffer);
 	}
 
 	if (ci->ci_comment) {
@@ -2405,7 +2446,7 @@ openFile (CT ct, char **file)
     int	fd, cachetype;
     char cachefile[BUFSIZ];
     struct exbody *e = ct->c_ctexbody;
-    CE ce = ct->c_cefile;
+    CE ce = &ct->c_cefile;
 
     switch (openExternal (e->eb_parent, e->eb_content, ce, file, &fd)) {
 	case NOTOK:
@@ -2431,7 +2472,7 @@ openFile (CT ct, char **file)
 	return NOTOK;
     }
 
-    if ((!e->eb_permission || mh_strcasecmp (e->eb_permission, "read-write"))
+    if ((!e->eb_permission || strcasecmp (e->eb_permission, "read-write"))
 	    && find_cache (NULL, wcachesw, &cachetype, e->eb_content->c_id,
 		cachefile, sizeof(cachefile)) != NOTOK) {
 	int mask;
@@ -2452,12 +2493,12 @@ openFile (CT ct, char **file)
 
 	    if (ferror (gp)) {
 		admonish (ce->ce_file, "error reading");
-		unlink (cachefile);
+		(void) m_unlink (cachefile);
 	    }
 	    else
 		if (ferror (fp)) {
 		    admonish (cachefile, "error writing");
-		    unlink (cachefile);
+		    (void) m_unlink (cachefile);
 		}
 	    fclose (fp);
 	}
@@ -2488,12 +2529,11 @@ openFTP (CT ct, char **file)
     char *bp, *ftp, *user, *pass;
     char buffer[BUFSIZ], cachefile[BUFSIZ];
     struct exbody *e;
-    CE ce;
+    CE ce = &ct->c_cefile;
     static char *username = NULL;
     static char *password = NULL;
 
     e  = ct->c_ctexbody;
-    ce = ct->c_cefile;
 
     if ((ftp = context_find (nmhaccessftp)) && !*ftp)
 	ftp = NULL;
@@ -2578,7 +2618,7 @@ openFTP (CT ct, char **file)
     ce->ce_unlink = (*file == NULL);
     caching = 0;
     cachefile[0] = '\0';
-    if ((!e->eb_permission || mh_strcasecmp (e->eb_permission, "read-write"))
+    if ((!e->eb_permission || strcasecmp (e->eb_permission, "read-write"))
 	    && find_cache (NULL, wcachesw, &cachetype, e->eb_content->c_id,
 		cachefile, sizeof(cachefile)) != NOTOK) {
 	if (*file == NULL) {
@@ -2591,8 +2631,14 @@ openFTP (CT ct, char **file)
 	ce->ce_file = add (*file, NULL);
     else if (caching)
 	ce->ce_file = add (cachefile, NULL);
-    else
-	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
+    else {
+	char *tempfile;
+	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	ce->ce_file = add (tempfile, NULL);
+    }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
 	content_error (ce->ce_file, ct, "unable to fopen for reading/writing");
@@ -2611,13 +2657,13 @@ openFTP (CT ct, char **file)
 	vec[vecp++] = e->eb_dir;
 	vec[vecp++] = e->eb_name;
 	vec[vecp++] = ce->ce_file,
-	vec[vecp++] = e->eb_mode && !mh_strcasecmp (e->eb_mode, "ascii")
+	vec[vecp++] = e->eb_mode && !strcasecmp (e->eb_mode, "ascii")
 	    		? "ascii" : "binary";
 	vec[vecp] = NULL;
 
 	fflush (stdout);
 
-	for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
 	    sleep (5);
 	switch (child_id) {
 	    case NOTOK:
@@ -2663,12 +2709,12 @@ openFTP (CT ct, char **file)
 
 		if (ferror (gp)) {
 		    admonish (ce->ce_file, "error reading");
-		    unlink (cachefile);
+		    (void) m_unlink (cachefile);
 		}
 		else
 		    if (ferror (fp)) {
 			admonish (cachefile, "error writing");
-			unlink (cachefile);
+			(void) m_unlink (cachefile);
 		    }
 		fclose (fp);
 	    }
@@ -2700,7 +2746,7 @@ openMail (CT ct, char **file)
     int len, buflen;
     char *bp, buffer[BUFSIZ], *vec[7];
     struct exbody *e = ct->c_ctexbody;
-    CE ce = ct->c_cefile;
+    CE ce = &ct->c_cefile;
 
     switch (openExternal (e->eb_parent, e->eb_content, ce, file, &fd)) {
 	case NOTOK:
@@ -2759,7 +2805,7 @@ openMail (CT ct, char **file)
     vec[vecp++] = e->eb_body;
     vec[vecp] = NULL;
 
-    for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
 	sleep (5);
     switch (child_id) {
 	case NOTOK:
@@ -2780,7 +2826,12 @@ openMail (CT ct, char **file)
     }
 
     if (*file == NULL) {
-	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
+	char *tempfile;
+	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	ce->ce_file = add (tempfile, NULL);
 	ce->ce_unlink = 1;
     } else {
 	ce->ce_file = add (*file, NULL);
@@ -2804,40 +2855,181 @@ openMail (CT ct, char **file)
 }
 
 
+/*
+ * URL
+ */
+
 static int
-readDigest (CT ct, char *cp)
+InitURL (CT ct)
 {
-    int	bitno, skip;
-    uint32_t bits;
-    char *bp = cp;
-    unsigned char *dp, value, *ep;
+    return init_encoding (ct, openURL);
+}
 
-    bitno = 18;
-    bits = 0L;
-    skip = 0;
 
-    for (ep = (dp = ct->c_digest)
-	         + sizeof(ct->c_digest) / sizeof(ct->c_digest[0]); *cp; cp++)
-	switch (*cp) {
-	    default:
-	        if (skip
-		        || (*cp & 0x80)
-		        || (value = b642nib[*cp & 0x7f]) > 0x3f) {
-		    if (debugsw)
-			fprintf (stderr, "invalid BASE64 encoding\n");
-		    return NOTOK;
-		}
+static int
+openURL (CT ct, char **file)
+{
+    struct exbody *e = ct->c_ctexbody;
+    CE ce = &ct->c_cefile;
+    char *urlprog, *program;
+    char buffer[BUFSIZ], cachefile[BUFSIZ];
+    int fd, caching, cachetype;
+    struct msgs_array args = { 0, 0, NULL};
+    pid_t child_id;
 
-		bits |= value << bitno;
-test_end:
-		if ((bitno -= 6) < 0) {
-		    if (dp + (3 - skip) > ep)
-			goto invalid_digest;
-		    *dp++ = (bits >> 16) & 0xff;
-		    if (skip < 2) {
-			*dp++ = (bits >> 8) & 0xff;
-			if (skip < 1)
-			    *dp++ = bits & 0xff;
+    if ((urlprog = context_find(nmhaccessurl)) && *urlprog == '\0')
+    	urlprog = NULL;
+
+    if (! urlprog) {
+    	content_error(NULL, ct, "No entry for nmh-access-url in profile");
+    	return NOTOK;
+    }
+
+    switch (openExternal(e->eb_parent, e->eb_content, ce, file, &fd)) {
+    	case NOTOK:
+	    return NOTOK;
+
+	case OK:
+	    break;
+
+	case DONE:
+	    return fd;
+    }
+
+    if (!e->eb_url) {
+    	content_error(NULL, ct, "missing url parameter");
+	return NOTOK;
+    }
+
+    if (xpid) {
+	if (xpid < 0)
+	    xpid = -xpid;
+	pidcheck (pidwait (xpid, NOTOK));
+	xpid = 0;
+    }
+
+    ce->ce_unlink = (*file == NULL);
+    caching = 0;
+    cachefile[0] = '\0';
+
+    if (find_cache(NULL, wcachesw, &cachetype, e->eb_content->c_id,
+    		   cachefile, sizeof(cachefile)) != NOTOK) {
+	if (*file == NULL) {
+	    ce->ce_unlink = 0;
+	    caching = 1;
+	}
+    }
+
+    if (*file)
+    	ce->ce_file = add(*file, NULL);
+    else if (caching)
+    	ce->ce_file = add(cachefile, NULL);
+    else {
+	char *tempfile;
+	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	ce->ce_file = add (tempfile, NULL);
+    }
+
+    if ((ce->ce_fp = fopen(ce->ce_file, "w+")) == NULL) {
+    	content_error(ce->ce_file, ct, "unable to fopen for read/writing");
+	return NOTOK;
+    }
+
+    switch (child_id = fork()) {
+    case NOTOK:
+    	adios ("fork", "unable to");
+	/* NOTREACHED */
+
+    case OK:
+    	argsplit_msgarg(&args, urlprog, &program);
+	app_msgarg(&args, e->eb_url);
+	app_msgarg(&args, NULL);
+	dup2(fileno(ce->ce_fp), 1);
+	close(fileno(ce->ce_fp));
+	execvp(program, args.msgs);
+	fprintf(stderr, "Unable to exec ");
+	perror(program);
+	_exit(-1);
+	/* NOTREACHED */
+
+    default:
+    	if (pidXwait(child_id, NULL)) {
+	    ce->ce_unlink = 1;
+	    return NOTOK;
+	}
+    }
+
+    if (cachefile[0]) {
+    	if (caching)
+	    chmod(cachefile, cachetype ? m_gmprot() : 0444);
+	else {
+	    int mask;
+	    FILE *fp;
+
+	    mask = umask (cachetype ? ~m_gmprot() : 0222);
+	    if ((fp = fopen(cachefile, "w"))) {
+	    	int cc;
+		FILE *gp = ce->ce_fp;
+
+		fseeko(gp, 0, SEEK_SET);
+
+		while ((cc = fread(buffer, sizeof(*buffer),
+				   sizeof(buffer), gp)) > 0)
+		    fwrite(buffer, sizeof(*buffer), cc, fp);
+
+		fflush(fp);
+
+		if (ferror(gp)) {
+		    admonish(ce->ce_file, "error reading");
+		    (void) m_unlink (cachefile);
+		}
+	    }
+	    umask(mask);
+	}
+    }
+
+    fseeko(ce->ce_fp, 0, SEEK_SET);
+    *file = ce->ce_file;
+    return fd;
+}
+
+static int
+readDigest (CT ct, char *cp)
+{
+    int	bitno, skip;
+    uint32_t bits;
+    char *bp = cp;
+    unsigned char *dp, value, *ep;
+
+    bitno = 18;
+    bits = 0L;
+    skip = 0;
+
+    for (ep = (dp = ct->c_digest)
+	         + sizeof(ct->c_digest) / sizeof(ct->c_digest[0]); *cp; cp++)
+	switch (*cp) {
+	    default:
+	        if (skip
+		        || (*cp & 0x80)
+		        || (value = b642nib[*cp & 0x7f]) > 0x3f) {
+		    if (debugsw)
+			fprintf (stderr, "invalid BASE64 encoding\n");
+		    return NOTOK;
+		}
+
+		bits |= value << bitno;
+test_end:
+		if ((bitno -= 6) < 0) {
+		    if (dp + (3 - skip) > ep)
+			goto invalid_digest;
+		    *dp++ = (bits >> 16) & 0xff;
+		    if (skip < 2) {
+			*dp++ = (bits >> 8) & 0xff;
+			if (skip < 1)
+			    *dp++ = bits & 0xff;
 		    }
 		    bitno = 18;
 		    bits = 0L;
@@ -2878,3 +3070,736 @@ invalid_digest:
 
     return OK;
 }
+
+
+/* Multipart parts might have content before the first subpart and/or
+   after the last subpart that hasn't been stored anywhere else, so do
+   that. */
+int
+get_leftover_mp_content (CT ct, int before /* or after */) {
+    struct multipart *m = (struct multipart *) ct->c_ctparams;
+    char *boundary;
+    int found_boundary = 0;
+    char buffer[BUFSIZ];
+    int max = BUFSIZ;
+    int read = 0;
+    char *content = NULL;
+
+    if (! m) return NOTOK;
+
+    if (before) {
+        if (! m->mp_parts  ||  ! m->mp_parts->mp_part) return NOTOK;
+
+        /* Isolate the beginning of this part to the beginning of the
+           first subpart and save any content between them. */
+        fseeko (ct->c_fp, ct->c_begin, SEEK_SET);
+        max = m->mp_parts->mp_part->c_begin - ct->c_begin;
+        boundary = concat ("--", m->mp_start, NULL);
+    } else {
+        struct part *last_subpart = NULL;
+        struct part *subpart;
+
+        /* Go to the last subpart to get its end position. */
+        for (subpart = m->mp_parts; subpart; subpart = subpart->mp_next) {
+            last_subpart = subpart;
+        }
+
+        if (last_subpart == NULL) return NOTOK;
+
+        /* Isolate the end of the last subpart to the end of this part
+           and save any content between them. */
+        fseeko (ct->c_fp, last_subpart->mp_part->c_end, SEEK_SET);
+        max = ct->c_end - last_subpart->mp_part->c_end;
+        boundary = concat ("--", m->mp_stop, NULL);
+    }
+
+    /* Back up by 1 to pick up the newline. */
+    while (fgets (buffer, sizeof(buffer) - 1, ct->c_fp)) {
+        read += strlen (buffer);
+        /* Don't look beyond beginning of first subpart (before) or
+           next part (after). */
+        if (read > max) buffer[read-max] = '\0';
+
+        if (before) {
+            if (! strcmp (buffer, boundary)) {
+                found_boundary = 1;
+            }
+        } else {
+            if (! found_boundary  &&  ! strcmp (buffer, boundary)) {
+                found_boundary = 1;
+                continue;
+            }
+        }
+
+        if ((before && ! found_boundary)  ||  (! before && found_boundary)) {
+            if (content) {
+                char *old_content = content;
+                content = concat (content, buffer, NULL);
+                free (old_content);
+            } else {
+                content = before
+                    ?  concat ("\n", buffer, NULL)
+                    :  concat (buffer, NULL);
+            }
+        }
+
+        if (before) {
+            if (found_boundary  ||  read > max) break;
+        } else {
+            if (read > max) break;
+        }
+    }
+
+    /* Skip the newline if that's all there is. */
+    if (content) {
+        char *cp;
+
+        /* Remove trailing newline, except at EOF. */
+        if ((before || ! feof (ct->c_fp)) &&
+            (cp = content + strlen (content)) > content  &&
+            *--cp == '\n') {
+            *cp = '\0';
+        }
+
+        if (strlen (content) > 1) {
+            if (before) {
+                m->mp_content_before = content;
+            } else {
+                m->mp_content_after = content;
+            }
+        } else {
+            free (content);
+        }
+    }
+
+    free (boundary);
+
+    return OK;
+}
+
+
+char *
+ct_type_str (int type) {
+    switch (type) {
+    case CT_APPLICATION:
+        return "application";
+    case CT_AUDIO:
+        return "audio";
+    case CT_IMAGE:
+        return "image";
+    case CT_MESSAGE:
+        return "message";
+    case CT_MULTIPART:
+        return "multipart";
+    case CT_TEXT:
+        return "text";
+    case CT_VIDEO:
+        return "video";
+    case CT_EXTENSION:
+        return "extension";
+    default:
+        return "unknown_type";
+    }
+}
+
+
+char *
+ct_subtype_str (int type, int subtype) {
+    switch (type) {
+    case CT_APPLICATION:
+        switch (subtype) {
+        case APPLICATION_OCTETS:
+            return "octets";
+        case APPLICATION_POSTSCRIPT:
+            return "postscript";
+        default:
+            return "unknown_app_subtype";
+        }
+    case CT_MESSAGE:
+        switch (subtype) {
+        case MESSAGE_RFC822:
+            return "rfc822";
+        case MESSAGE_PARTIAL:
+            return "partial";
+        case MESSAGE_EXTERNAL:
+            return "external";
+        default:
+            return "unknown_msg_subtype";
+        }
+    case CT_MULTIPART:
+        switch (subtype) {
+        case MULTI_MIXED:
+            return "mixed";
+        case MULTI_ALTERNATE:
+            return "alternative";
+        case MULTI_DIGEST:
+            return "digest";
+        case MULTI_PARALLEL:
+            return "parallel";
+        default:
+            return "unknown_multipart_subtype";
+        }
+    case CT_TEXT:
+        switch (subtype) {
+        case TEXT_PLAIN:
+            return "plain";
+        case TEXT_RICHTEXT:
+            return "richtext";
+        case TEXT_ENRICHED:
+            return "enriched";
+        default:
+            return "unknown_text_subtype";
+        }
+    default:
+        return "unknown_type";
+    }
+}
+
+
+/* Find the content type and InitFunc for the CT. */
+const struct str2init *
+get_ct_init (int type) {
+    const struct str2init *sp;
+
+    for (sp = str2cts; sp->si_key; ++sp) {
+        if (type == sp->si_val) {
+            return sp;
+        }
+    }
+
+    return NULL;
+}
+
+const char *
+ce_str (int encoding) {
+    switch (encoding) {
+    case CE_BASE64:
+        return "base64";
+    case CE_QUOTED:
+        return "quoted-printable";
+    case CE_8BIT:
+        return "8bit";
+    case CE_7BIT:
+        return "7bit";
+    case CE_BINARY:
+        return "binary";
+    case CE_EXTENSION:
+        return "extension";
+    case CE_EXTERNAL:
+        return "external";
+    default:
+        return "unknown";
+    }
+}
+
+/* Find the content type and InitFunc for the content encoding method. */
+const struct str2init *
+get_ce_method (const char *method) {
+    struct str2init *sp;
+
+    for (sp = str2ces; sp->si_key; ++sp) {
+        if (! strcasecmp (method, sp->si_key)) {
+            return sp;
+        }
+    }
+
+    return NULL;
+}
+
+int
+parse_header_attrs (const char *filename, const char *fieldname,
+		    char **header_attrp, PM *param_head, PM *param_tail,
+		    char **commentp)
+{
+    char *cp = *header_attrp;
+    PM pm;
+
+    while (*cp == ';') {
+	char *dp, *vp, *up, c;
+
+	cp++;
+	while (isspace ((unsigned char) *cp))
+	    cp++;
+
+	if (*cp == '('  &&
+            get_comment (filename, fieldname, &cp, commentp) == NOTOK) {
+	    return NOTOK;
+        }
+
+	if (*cp == 0) {
+	    advise (NULL,
+		    "extraneous trailing ';' in message %s's %s: "
+                    "parameter list",
+		    filename, fieldname);
+	    return DONE;
+	}
+
+	/* down case the attribute name */
+	for (dp = cp; istoken ((unsigned char) *dp); dp++)
+	    if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
+		*dp = tolower ((unsigned char) *dp);
+
+	for (up = dp; isspace ((unsigned char) *dp);)
+	    dp++;
+	if (dp == cp || *dp != '=') {
+	    advise (NULL,
+		    "invalid parameter in message %s's %s: "
+                    "field\n%*sparameter %s (error detected at offset %d)",
+		    filename, fieldname, strlen(invo_name) + 2, "",cp, dp - cp);
+	    return NOTOK;
+	}
+
+	pm = mh_xmalloc(sizeof(*pm));
+	memset(pm, 0, sizeof(*pm));
+
+	/* This is all mega-bozo and needs cleanup */
+	vp = (pm->pm_name = add (cp, NULL)) + (up - cp);
+	*vp = '\0';
+	for (dp++; isspace ((unsigned char) *dp);)
+	    dp++;
+
+	/* Now store the attribute value. */
+
+	vp = pm->pm_name + (dp - cp);
+
+	if (*dp == '"') {
+	    for (cp = ++dp, dp = vp;;) {
+		switch (c = *cp++) {
+		    case '\0':
+bad_quote:
+		        advise (NULL,
+				"invalid quoted-string in message %s's %s: "
+                                "field\n%*s(parameter %s)",
+				filename, fieldname, strlen(invo_name) + 2, "",
+				pm->pm_name);
+			return NOTOK;
+
+		    case '\\':
+			*dp++ = c;
+			if ((c = *cp++) == '\0')
+			    goto bad_quote;
+			/* else fall... */
+
+		    default:
+			*dp++ = c;
+			continue;
+
+		    case '"':
+			*dp = '\0';
+			break;
+		}
+		break;
+	    }
+	} else {
+	    for (cp = dp, dp = vp; istoken (*cp); cp++, dp++)
+		continue;
+	    *dp = '\0';
+	}
+	pm->pm_value = getcpy(vp); 
+	if (!*vp) {
+	    advise (NULL,
+		    "invalid parameter in message %s's %s: "
+                    "field\n%*s(parameter %s)",
+		    filename, fieldname, strlen(invo_name) + 2, "",
+		    pm->pm_name);
+	    return NOTOK;
+	}
+
+	while (isspace ((unsigned char) *cp))
+	    cp++;
+
+	if (*cp == '('  &&
+            get_comment (filename, fieldname, &cp, commentp) == NOTOK) {
+	    return NOTOK;
+        }
+
+	if (*param_head == NULL) {
+	    *param_head = pm;
+	    *param_tail = pm;
+	} else {
+	    (*param_tail)->pm_next = pm;
+	    *param_tail = pm;
+	}
+    }
+
+    *header_attrp = cp;
+    return OK;
+}
+
+/*
+ * Create a string based on a list of output parameters.  Assume that this
+ * parameter string will be appended to an existing header, so start out
+ * with the separator (;).  Perform RFC 2231 encoding when necessary.
+ */
+
+char *
+output_params(size_t initialwidth, PM params, int *offsetout)
+{
+    char *paramout = NULL;
+    char line[CPERLIN * 2], *q;
+    int curlen, index, eightbit, encode, i;
+    size_t valoff;
+
+    while (params != NULL) {
+	encode = 0;
+	index = 0;
+	valoff = 0;
+	q = line;
+
+	if (strlen(params->pm_name) > CPERLIN) {
+	    advise(NULL, "Parameter name \"%s\" is too long", params->pm_name);
+	    if (paramout)
+		free(paramout);
+	    return NULL;
+	}
+
+	curlen = param_len(params, index, valoff, &eightbit);
+
+	/*
+	 * Loop until we get a parameter that fits within a line.  We
+	 * assume new lines start with a tab, so check our overflow based
+	 * on that.
+	 */
+
+	while (curlen + 8 > CPERLIN - 1) {
+	    int curvallen = strlen(params->pm_value + valoff) -
+	    			(curlen + 8 - (CPERLIN - 1));
+
+	    *q++ = ';';
+	    *q++ = '\n';
+	    *q++ = '\t';
+
+	    /*
+	     * curvallen holds how many characters we take from this
+	     * current value.  Make sure it's at least 1.
+	     */
+
+	    if (curvallen < 1)
+	    	curvallen = 1;
+
+	    /*
+	     * At this point we're definitely continuing the line, so
+	     * be sure to include the parameter name and section index.
+	     */
+
+	    q += snprintf(q, sizeof(line) - (q - line), "%s*%d",
+			  params->pm_name, index);
+
+	    /*
+	     * If eightbit was set and we're on index 0, we need to include
+	     * the character set and encode the first section.  Otherwise
+	     * only encode if the section we're on contains an 8bit character.
+	     */
+
+	    if (eightbit && index == 0)
+	    	encode = 1;
+	    else if (eightbit && contains8bit(params->pm_value + valoff,
+	    				params->pm_value + valoff + curvallen))
+		encode = 1;
+
+	    /*
+	     * Both of these functions do a NUL termination
+	     */
+
+	    if (encode)
+		i = encode_param(params, q, sizeof(line) - (q - line),
+				 curvallen, valoff, index);
+	    else
+		i = normal_param(params, q, sizeof(line) - (q - line),
+				 curvallen, valoff);
+
+	    if (i == 0) {
+		if (paramout)
+		    free(paramout);
+		return NULL;
+	    }
+
+	    valoff += curvallen;
+	    index++;
+	    curlen = param_len(params, index, valoff, &eightbit);
+	    q = line;
+
+	    /*
+	     * "line" starts with a ;\n\t, so that doesn't count against
+	     * the length.  But add 8 since it starts with a tab; that's
+	     * how we end up with 5.
+	     */
+
+	    initialwidth = strlen(line) + 5;
+
+	    /*
+	     * At this point the line should be built, so add it to our
+	     * current output buffer.
+	     */
+
+	    paramout = add(line, paramout);
+	}
+
+	/*
+	 * If this won't fit on the line, start a new one.  Save room in
+	 * case we need a semicolon on the end
+	 */
+
+	if (initialwidth + curlen > CPERLIN - 1) {
+	    *q++ = ';';
+	    *q++ = '\n';
+	    *q++ = '\t';
+	    initialwidth = 8;
+	} else {
+	    *q++ = ';';
+	    *q++ = ' ';
+	    initialwidth += 2;
+	}
+
+	/*
+	 * At this point, we're either finishing a contined parameter, or
+	 * we're working on a new one.
+	 */
+
+	if (index > 0) {
+	    q += snprintf(q, sizeof(line) - (q - line), "%s*%d",
+	    		  params->pm_name, index);
+	} else {
+	    strncpy(q, params->pm_name, sizeof(line) - (q - line));
+	    q += strlen(q);
+	}
+
+	if (eightbit)
+	    i = encode_param(params, q, sizeof(line) - (q - line),
+	    		     strlen(params->pm_value + valoff), valoff, index);
+	else
+	    i = normal_param(params, q, sizeof(line) - (q - line),
+	    		     strlen(params->pm_value + valoff), valoff);
+
+	if (i == 0) {
+	    if (paramout)
+		free(paramout);
+	    return NULL;
+	}
+
+	paramout = add(line, paramout);
+	initialwidth += strlen(line);
+
+	params = params->pm_next;
+    }
+
+    if (offsetout)
+	*offsetout = initialwidth;
+
+    return paramout;
+}
+
+/*
+ * Calculate the size of a parameter.  Include any necessary encoding.
+ * Start the length computation from where "offset" is marked.
+ */
+
+static size_t
+param_len(PM pm, int index, size_t valueoff, int *eightbit)
+{
+    char *start = pm->pm_value + valueoff, *p;
+    size_t len = 0;
+
+    /*
+     * Add up the length.  First, start with the parameter name, and include
+     * the equal sign.
+     */
+
+    len += strlen(pm->pm_name) + 1;
+
+    /*
+     * Scan the parameter value.  If we find an 8-bit character, then
+     * we need to compute the locale name for the length.
+     */
+
+    *eightbit = contains8bit(start, NULL);
+
+    /*
+     * If we've got 8-bit character, put the locale on the front (if we're
+     * doing part 0.  Also compute the length of the string based on the
+     * encoding we need to do.
+     */
+
+    if (*eightbit) {
+	/*
+	 * If we don't have a charset or language tag in this parameter,
+	 * add them now.
+	 */
+
+	if (! pm->pm_charset)
+	    pm->pm_charset = getcpy(write_charset_8bit());
+	if (! pm->pm_lang)
+	    pm->pm_lang = getcpy(NULL);	/* Default to a blank lang tag */
+
+	len++;		/* For the encoding we need to do */
+	if (index == 0) {
+	    len += strlen(pm->pm_charset) + strlen(pm->pm_lang) + 2;
+	} else {
+	    /*
+	     * We know we definitely need to include an index.
+	     * This will get the length wrong if we have more than 99
+	     * sections. I can live with that.
+	     */
+	    len += 2;	/* *<N> */
+	    if (index > 9)
+		len++;
+	}
+	for (p = start; *p != '\0'; p++) {
+	    if (isparamencode(*p))
+		len += 3;
+	    else
+	    	len++;
+	}
+    } else {
+    	/*
+	 * Calculate the string length, but add room for quoting \
+	 * and " if necessary.  Also account for quotes at beginning
+	 * and end.
+	 */
+	for (p = start; *p != '\0'; p++) {
+	    switch (*p) {
+	    case '"':
+	    case '\\':
+	    	len++;
+	    /* FALL THROUGH */
+	    default:
+		len++;
+	    }
+	}
+
+	len += 2;
+    }
+
+    return len;
+}
+
+/*
+ * Output an encoded parameter string.
+ */
+
+static size_t
+encode_param(PM pm, char *output, size_t len, size_t valuelen,
+	      size_t valueoff, int index)
+{
+    size_t outlen = 0, n;
+    char *endptr = output + len, *p;
+
+    /*
+     * First, output the marker for an encoded string.
+     */
+
+    *output++ = '*';
+    *output++ = '=';
+    outlen += 2;
+
+    /*
+     * If the index is 0, output the character set and language tag.
+     * If theses were NULL, they should have already been filled in
+     * by param_len().
+     */
+
+    if (index == 0) {
+	n = snprintf(output, len - outlen, "%s'%s'", pm->pm_charset,
+		     pm->pm_lang);
+	output += n;
+	outlen += n;
+	if (output > endptr) {
+	    advise(NULL, "Internal error: parameter buffer overflow");
+	    return 0;
+	}
+    }
+
+    /*
+     * Copy over the value, encoding if necessary
+     */
+
+    p = pm->pm_value + valueoff;
+    while (valuelen-- > 0) {
+	if (isparamencode(*p)) {
+	    n = snprintf(output, len - outlen, "%%%02X", (unsigned char) *p++);
+	    output += n;
+	    outlen += n;
+	} else {
+	    *output++ = *p++;
+	    outlen++;
+	}
+	if (output > endptr) {
+	    advise(NULL, "Internal error: parameter buffer overflow");
+	    return 0;
+	}
+    }
+
+    *output = '\0';
+
+    return outlen;
+}
+
+/*
+ * Output a "normal" parameter, without encoding.  Be sure to escape
+ * quotes and backslashes if necessary.
+ */
+
+static size_t
+normal_param(PM pm, char *output, size_t len, size_t valuelen,
+	     size_t valueoff)
+{
+    size_t outlen = 0;
+    char *endptr = output + len, *p;
+
+    *output++ = '=';
+    *output++ = '"';
+    outlen += 2;
+
+    p = pm->pm_value + valueoff;
+
+    while (valuelen-- > 0) {
+	switch (*p) {
+	case '\\':
+	case '"':
+	    *output++ = '\\';
+	    outlen++;
+	default:
+	    *output++ = *p++;
+	    outlen++;
+	}
+	if (output > endptr) {
+	    advise(NULL, "Internal error: parameter buffer overflow");
+	    return 0;
+	}
+    }
+
+    if (output - 2 > endptr) {
+	advise(NULL, "Internal error: parameter buffer overflow");
+	return 0;
+    }
+
+    *output++ = '"';
+    *output++ = '\0';
+
+    return outlen + 1;
+}
+
+/*
+ * Add a parameter to the parameter linked list
+ */
+
+PM
+add_param(PM *first, PM *last, const char *name, const char *value)
+{
+    PM pm = mh_xmalloc(sizeof(*pm));
+
+    memset(pm, 0, sizeof(*pm));
+
+    pm->pm_name = getcpy(name);
+    pm->pm_value = getcpy(value);
+
+    if (*first) {
+	(*last)->pm_next = pm;
+	*last = pm;
+    } else {
+    	*first = pm;
+	*last = pm;
+    }
+
+    return pm;
+}