X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9d45b5ba0226609b41d6ae47b19d195db3239c74..9cc2510:/uip/mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index a973fd9c..2a230385 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -145,7 +145,7 @@ build_mime (char *infile, int autobuild, int dist, int directives,
     /*
      * Allocate space for primary (outside) content
      */
-    if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL)
+    if ((ct = (CT) mh_xcalloc (1, sizeof(*ct))) == NULL)
 	adios (NULL, "out of memory");
 
     /*
@@ -170,9 +170,10 @@ build_mime (char *infile, int autobuild, int dist, int directives,
 
 	    /* abort if draft has Mime-Version or C-T-E header field */
 	    if (strcasecmp (name, VRSN_FIELD) == 0 ||
-	    	strcasecmp (name, ENCODING_FIELD) == 0) {
+		strcasecmp (name, ENCODING_FIELD) == 0) {
 		if (autobuild) {
 		    fclose(in);
+		    free (ct);
 		    return NULL;
 		} else {
 		    adios (NULL, "draft shouldn't contain %s: field", name);
@@ -205,9 +206,9 @@ build_mime (char *infile, int autobuild, int dist, int directives,
 	     */
 
 	    if (strcasecmp(ATTACH_FIELD, np) == 0) {
-	    	struct attach_list *entry;
+		struct attach_list *entry;
 		char *s = vp, *e = vp + strlen(vp) - 1;
-	    	free(np);
+		free(np);
 
 		/*
 		 * Make sure we can find the start of this filename.
@@ -268,7 +269,7 @@ finish_field:
      */
 
     for (hp = ct->c_first_hf; hp != NULL; hp = hp->next) {
-    	if (encode_rfc2047(hp->name, &hp->value, header_encoding, NULL)) {
+	if (encode_rfc2047(hp->name, &hp->value, header_encoding, NULL)) {
 	    adios(NULL, "Unable to encode header \"%s\"", hp->name);
 	}
     }
@@ -294,7 +295,7 @@ finish_field:
     ct->c_type = CT_MULTIPART;
     ct->c_subtype = MULTI_MIXED;
 
-    if ((m = (struct multipart *) calloc (1, sizeof(*m))) == NULL)
+    if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)
 	adios (NULL, "out of memory");
     ct->c_ctparams = (void *) m;
     pp = &m->mp_parts;
@@ -314,7 +315,7 @@ finish_field:
 	if (!p)
 	    continue;
 
-	if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+	if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
 	    adios (NULL, "out of memory");
 	*pp = part;
 	pp = &part->mp_next;
@@ -327,15 +328,15 @@ finish_field:
      */
 
     for (at_entry = attach_head; at_entry; ) {
-    	struct attach_list *at_prev = at_entry;
-    	struct part *part;
+	struct attach_list *at_prev = at_entry;
+	struct part *part;
 	CT p;
 
 	if (access(at_entry->filename, R_OK) != 0) {
 	    adios("reading", "Unable to open %s for", at_entry->filename);
 	}
 
-	if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
+	if ((p = (CT) mh_xcalloc (1, sizeof(*p))) == NULL)
 	    adios(NULL, "out of memory");
 
 	init_decoded_content(p, infile);
@@ -348,7 +349,7 @@ finish_field:
 
 	setup_attach_content(p, at_entry->filename);
 
-	if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+	if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
 	    adios (NULL, "out of memory");
 	*pp = part;
 	pp = &part->mp_next;
@@ -365,11 +366,11 @@ finish_field:
      */
 
     if (!m->mp_parts) {
-    	CT p;
-    	struct part *part;
+	CT p;
+	struct part *part;
 	struct text *t;
 
-	if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
+	if ((p = (CT) mh_xcalloc (1, sizeof(*p))) == NULL)
 	    adios(NULL, "out of memory");
 
 	init_decoded_content(p, infile);
@@ -389,16 +390,15 @@ finish_field:
 	p->c_begin = ftell(in);
 	p->c_end = ftell(in);
 
-	if ((t = (struct text *) calloc (1, sizeof (*t))) == NULL)
+	if ((t = (struct text *) mh_xcalloc (1, sizeof (*t))) == NULL)
 	    adios (NULL, "out of memory");
 
 	t->tx_charset = CHARSET_SPECIFIED;
 	p->c_ctparams = t;
 
-	if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+	if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
 	    adios (NULL, "out of memory");
 	*pp = part;
-	pp = &part->mp_next;
 	part->mp_part = p;
     }
 
@@ -450,7 +450,7 @@ finish_field:
         } else {
 	    if (*++cp == 0)
 		adios (NULL, "giving up trying to find a unique delimiter string");
-    	    else
+	    else
 		(*cp)++;
 	}
     }
@@ -544,7 +544,7 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename)
     }
 
     /* allocate basic Content structure */
-    if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL)
+    if ((ct = (CT) mh_xcalloc (1, sizeof(*ct))) == NULL)
 	adios (NULL, "out of memory");
     *ctp = ct;
 
@@ -776,17 +776,16 @@ use_forw:
 	     * reference, we need to create another Content structure
 	     * for the message/external-body to wrap it in.
 	     */
-	    if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL)
+	    if ((ct = (CT) mh_xcalloc (1, sizeof(*ct))) == NULL)
 		adios (NULL, "out of memory");
 	    init_decoded_content(ct, infilename);
 	    *ctp = ct;
-	    ci = &ct->c_ctinfo;
 	    if (get_ctinfo (buffer, ct, 0) == NOTOK)
 		done (1);
 	    ct->c_type = CT_MESSAGE;
 	    ct->c_subtype = MESSAGE_EXTERNAL;
 
-	    if ((e = (struct exbody *) calloc (1, sizeof(*e))) == NULL)
+	    if ((e = (struct exbody *) mh_xcalloc (1, sizeof(*e))) == NULL)
 		adios (NULL, "out of memory");
 	    ct->c_ctparams = (void *) e;
 
@@ -827,14 +826,10 @@ use_forw:
 	 * No [file] argument, so check profile for
 	 * method to compose content.
 	 */
-	snprintf (buffer, sizeof(buffer), "%s-compose-%s/%s",
-		invo_name, ci->ci_type, ci->ci_subtype);
-	if ((cp = context_find (buffer)) == NULL || *cp == '\0') {
-	    snprintf (buffer, sizeof(buffer), "%s-compose-%s", invo_name, ci->ci_type);
-	    if ((cp = context_find (buffer)) == NULL || *cp == '\0') {
-		content_error (NULL, ct, "don't know how to compose content");
-		done (1);
-	    }
+	cp = context_find_by_type ("compose", ci->ci_type, ci->ci_subtype);
+	if (cp == NULL) {
+	    content_error (NULL, ct, "don't know how to compose content");
+	    done (1);
 	}
 	ci->ci_magic = add (cp, NULL);
 	return OK;
@@ -900,7 +895,7 @@ use_forw:
 	    ct->c_type = CT_MULTIPART;
 	    ct->c_subtype = MULTI_DIGEST;
 
-	    if ((m = (struct multipart *) calloc (1, sizeof(*m))) == NULL)
+	    if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)
 		adios (NULL, "out of memory");
 	    ct->c_ctparams = (void *) m;
 	    pp = &m->mp_parts;
@@ -911,7 +906,7 @@ use_forw:
 		    CT p;
 		    CE pe;
 
-		    if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
+		    if ((p = (CT) mh_xcalloc (1, sizeof(*p))) == NULL)
 			adios (NULL, "out of memory");
 		    init_decoded_content (p, infilename);
 		    pe = &p->c_cefile;
@@ -925,7 +920,7 @@ use_forw:
 		    if (listsw && stat (pe->ce_file, &st) != NOTOK)
 			p->c_end = (long) st.st_size;
 
-		    if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+		    if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
 			adios (NULL, "out of memory");
 		    *pp = part;
 		    pp = &part->mp_next;
@@ -986,7 +981,7 @@ use_forw:
 	ct->c_type = CT_MULTIPART;
 	ct->c_subtype = vrsn;
 
-	if ((m = (struct multipart *) calloc (1, sizeof(*m))) == NULL)
+	if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)
 	    adios (NULL, "out of memory");
 	ct->c_ctparams = (void *) m;
 
@@ -1003,7 +998,7 @@ use_forw:
 	    if (!p)
 		continue;
 
-	    if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+	    if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
 		adios (NULL, "out of memory");
 	    *pp = part;
 	    pp = &part->mp_next;
@@ -1162,7 +1157,7 @@ compose_content (CT ct, int verbose)
 
 			for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
 			    snprintf (bp, buflen, "%s%s=\"%s\"", s,
-			    	      pm->pm_name, get_param_value(pm, '?'));
+				    pm->pm_name, get_param_value(pm, '?'));
 			    len = strlen (bp);
 			    bp += len;
 			    buflen -= len;
@@ -1279,13 +1274,17 @@ raw:
 static int
 scan_content (CT ct, size_t maxunencoded)
 {
-    int len;
+    int prefix_len;
     int check8bit = 0, contains8bit = 0;  /* check if contains 8bit data */
-    int checklinelen = 0, linelen = 0;  /* check for long lines */ 
+    int checknul = 0, containsnul = 0;  /* check if contains NULs */
+    int checklinelen = 0, linelen = 0;  /* check for long lines */
     int checkllinelen = 0; /* check for extra-long lines */
     int checkboundary = 0, boundaryclash = 0; /* check if clashes with multipart boundary   */
     int checklinespace = 0, linespace = 0;  /* check if any line ends with space          */
-    char *cp = NULL, buffer[BUFSIZ];
+    char *cp = NULL;
+    char *bufp = NULL;
+    size_t buflen;
+    ssize_t gotlen;
     struct text *t = NULL;
     FILE *in = NULL;
     CE ce = &ct->c_cefile;
@@ -1326,22 +1325,24 @@ scan_content (CT ct, size_t maxunencoded)
 
     if (ct->c_type == CT_TEXT) {
 	t = (struct text *) ct->c_ctparams;
-	if (t->tx_charset == CHARSET_UNSPECIFIED)
+	if (t->tx_charset == CHARSET_UNSPECIFIED) {
 	    check8bit = 1;
+	    checknul = 1;
+	}
     }
 
     switch (ct->c_reqencoding) {
     case CE_8BIT:
-    	checkllinelen = 1;
+	checkllinelen = 1;
 	checkboundary = 1;
 	break;
     case CE_QUOTED:
-    	checkboundary = 1;
+	checkboundary = 1;
 	break;
     case CE_BASE64:
 	break;
     case CE_UNKNOWN:
-    	/* Use the default rules based on content-type */
+	/* Use the default rules based on content-type */
 	switch (ct->c_type) {
 	case CT_TEXT:
 	    checkboundary = 1;
@@ -1355,6 +1356,7 @@ scan_content (CT ct, size_t maxunencoded)
 
 	case CT_APPLICATION:
 	    check8bit = 1;
+	    checknul = 1;
 	    checklinelen = 1;
 	    checklinespace = 1;
 	    checkboundary = 1;
@@ -1394,29 +1396,31 @@ scan_content (CT ct, size_t maxunencoded)
      * Scan the unencoded content
      */
     if (check8bit || checklinelen || checklinespace || checkboundary ||
-	checkllinelen) {
+	checkllinelen || checknul) {
 	if ((in = fopen (ce->ce_file, "r")) == NULL)
 	    adios (ce->ce_file, "unable to open for reading");
-	len = strlen (prefix);
+	prefix_len = strlen (prefix);
 
-	while (fgets (buffer, sizeof(buffer) - 1, in)) {
+	while ((gotlen = getline(&bufp, &buflen, in)) != -1) {
 	    /*
-	     * Check for 8bit data.
+	     * Check for 8bit and NUL data.
 	     */
-	    if (check8bit) {
-		for (cp = buffer; *cp; cp++) {
-		    if (!isascii ((unsigned char) *cp)) {
-			contains8bit = 1;
-			check8bit = 0;	/* no need to keep checking */
-			break;
-		    }
+	    for (cp = bufp; (check8bit || checknul) &&
+					cp < bufp + gotlen; cp++) {
+		if (!isascii ((unsigned char) *cp)) {
+		    contains8bit = 1;
+		    check8bit = 0;	/* no need to keep checking */
+		}
+		if (!*cp) {
+		    containsnul = 1;
+		    checknul = 0;	/* no need to keep checking */
 		}
 	    }
 
 	    /*
 	     * Check line length.
 	     */
-	    if (checklinelen && (strlen (buffer) > maxunencoded + 1)) {
+	    if (checklinelen && ((size_t)gotlen > maxunencoded + 1)) {
 		linelen = 1;
 		checklinelen = 0;	/* no need to keep checking */
 	    }
@@ -1428,7 +1432,7 @@ scan_content (CT ct, size_t maxunencoded)
 	     */
 
 	    if (checkllinelen && !linelen &&
-					(strlen(buffer) > MAXLONGLINE + 1)) {
+					(gotlen > MAXLONGLINE + 1)) {
 		adios(NULL, "Line in content exceeds maximum line limit (%d)",
 		      MAXLONGLINE);
 	    }
@@ -1436,7 +1440,8 @@ scan_content (CT ct, size_t maxunencoded)
 	    /*
 	     * Check if line ends with a space.
 	     */
-	    if (checklinespace && (cp = buffer + strlen (buffer) - 2) > buffer && isspace ((unsigned char) *cp)) {
+	    if (checklinespace && (cp = bufp + gotlen - 2) > bufp &&
+			isspace ((unsigned char) *cp)) {
 		linespace = 1;
 		checklinespace = 0;	/* no need to keep checking */
 	    }
@@ -1445,18 +1450,20 @@ scan_content (CT ct, size_t maxunencoded)
 	     * Check if content contains a line that clashes
 	     * with our standard boundary for multipart messages.
 	     */
-	    if (checkboundary && buffer[0] == '-' && buffer[1] == '-') {
-		for (cp = buffer + strlen (buffer) - 1; cp >= buffer; cp--)
+	    if (checkboundary && bufp[0] == '-' && bufp[1] == '-') {
+		for (cp = bufp + gotlen - 1; cp >= bufp; cp--)
 		    if (!isspace ((unsigned char) *cp))
 			break;
 		*++cp = '\0';
-		if (!strncmp(buffer + 2, prefix, len) && isdigit((unsigned char) buffer[2 + len])) {
+		if (!strncmp(bufp + 2, prefix, prefix_len) &&
+			    isdigit((unsigned char) bufp[2 + prefix_len])) {
 		    boundaryclash = 1;
 		    checkboundary = 0;	/* no need to keep checking */
 		}
 	    }
 	}
 	fclose (in);
+	free(bufp);
     }
 
     /*
@@ -1468,9 +1475,16 @@ scan_content (CT ct, size_t maxunencoded)
 	t = (struct text *) ct->c_ctparams;
 	if (t->tx_charset == CHARSET_UNSPECIFIED) {
 	    CI ci = &ct->c_ctinfo;
+	    char *eightbitcharset = write_charset_8bit();
+
+	    if (contains8bit && strcasecmp(eightbitcharset, "US-ASCII") == 0) {
+		adios(NULL, "Text content contains 8 bit characters, but "
+		      "character set is US-ASCII");
+	    }
 
 	    add_param(&ci->ci_first_pm, &ci->ci_last_pm, "charset",
-	    	      contains8bit ? write_charset_8bit() : "us-ascii", 0);
+			contains8bit ? eightbitcharset : "us-ascii", 0);
+
 	    t->tx_charset = CHARSET_SPECIFIED;
 	}
     }
@@ -1480,25 +1494,31 @@ scan_content (CT ct, size_t maxunencoded)
      */
 
     if (ct->c_reqencoding != CE_UNKNOWN)
-    	ct->c_encoding = ct->c_reqencoding;
-    else
+	ct->c_encoding = ct->c_reqencoding;
+    else {
+	int wants_q_p = (containsnul || linelen || linespace || checksw);
+
 	switch (ct->c_type) {
 	case CT_TEXT:
-	    if (contains8bit && !linelen && !linespace && !checksw)
-		ct->c_encoding = CE_8BIT;
-	    else if (contains8bit || linelen || linespace || checksw)
-		ct->c_encoding = CE_QUOTED;
-	    else
-		ct->c_encoding = CE_7BIT;
+            if (wants_q_p)
+                 ct->c_encoding = CE_QUOTED;
+            else if (contains8bit)
+                 ct->c_encoding = CE_8BIT;
+            else
+                 ct->c_encoding = CE_7BIT;
+
 	    break;
 
 	case CT_APPLICATION:
 	    /* For application type, use base64, except when postscript */
-	    if (contains8bit || linelen || linespace || checksw)
-		ct->c_encoding = (ct->c_subtype == APPLICATION_POSTSCRIPT)
-		    ? CE_QUOTED : CE_BASE64;
-	    else
+	    if (wants_q_p || contains8bit) {
+		if (ct->c_subtype == APPLICATION_POSTSCRIPT)
+		    ct->c_encoding = CE_QUOTED;  /* historical */
+		else
+		    ct->c_encoding = CE_BASE64;
+	    } else {
 		ct->c_encoding = CE_7BIT;
+	    }
 	    break;
 
 	case CT_MESSAGE:
@@ -1512,6 +1532,7 @@ scan_content (CT ct, size_t maxunencoded)
 	    ct->c_encoding = CE_BASE64;
 	    break;
         }
+    }
 
     return (boundaryclash ? NOTOK : OK);
 }
@@ -1574,7 +1595,7 @@ build_headers (CT ct, int header_encoding)
 
 	if (!s)
 	    adios(NULL, "Internal error: failed outputting Content-Type "
-	    	  "parameters");
+		"parameters");
 
 	vp = add (s, vp);
 	free(s);
@@ -1745,7 +1766,7 @@ static char *
 calculate_digest (CT ct, int asciiP)
 {
     int	cc;
-    char buffer[BUFSIZ], *vp, *op;
+    char *vp, *op;
     unsigned char *dp;
     unsigned char digest[16];
     unsigned char outbuf[25];
@@ -1763,20 +1784,24 @@ calculate_digest (CT ct, int asciiP)
 
     /* calculate md5 message digest */
     if (asciiP) {
-	while (fgets (buffer, sizeof(buffer) - 1, in)) {
+	char *bufp = NULL;
+	size_t buflen;
+	ssize_t gotlen;
+	while ((gotlen = getline(&bufp, &buflen, in)) != -1) {
 	    char c, *cp;
 
-	    cp = buffer + strlen (buffer) - 1;
+	    cp = bufp + gotlen - 1;
 	    if ((c = *cp) == '\n')
-		*cp = '\0';
+		gotlen--;
 
-	    MD5Update (&mdContext, (unsigned char *) buffer,
-		       (unsigned int) strlen (buffer));
+	    MD5Update (&mdContext, (unsigned char *) bufp,
+		       (unsigned int) gotlen);
 
 	    if (c == '\n')
 		MD5Update (&mdContext, (unsigned char *) "\r\n", 2);
 	}
     } else {
+	char buffer[BUFSIZ];
 	while ((cc = fread (buffer, sizeof(*buffer), sizeof(buffer), in)) > 0)
 	    MD5Update (&mdContext, (unsigned char *) buffer, (unsigned int) cc);
     }
@@ -1800,7 +1825,7 @@ calculate_digest (CT ct, int asciiP)
 
     /* encode the digest using base64 */
     for (dp = digest, op = (char *) outbuf,
-    				cc = sizeof(digest) / sizeof(digest[0]);
+				cc = sizeof(digest) / sizeof(digest[0]);
 		cc > 0; cc -= 3, op += 4) {
 	unsigned long bits;
 	char *bp;
@@ -1840,9 +1865,10 @@ setup_attach_content(CT ct, char *filename)
     char *type, *simplename = r1bindex(filename, '/');
     struct str2init *s2i;
     PM pm;
+    char *cp;
 
     if (! (type = mime_type(filename))) {
-    	adios(NULL, "Unable to determine MIME type of \"%s\"", filename);
+	adios(NULL, "Unable to determine MIME type of \"%s\"", filename);
     }
 
     /*
@@ -1853,12 +1879,12 @@ setup_attach_content(CT ct, char *filename)
      */
 
     if (get_ctinfo(type, ct, 0) == NOTOK)
-    	done(1);
+	done(1);
 
     free(type);
 
     for (s2i = str2cts; s2i->si_key; s2i++)
-    	if (strcasecmp(ct->c_ctinfo.ci_type, s2i->si_key) == 0)
+	if (strcasecmp(ct->c_ctinfo.ci_type, s2i->si_key) == 0)
 	    break;
     if (!s2i->si_key && !uprf(ct->c_ctinfo.ci_type, "X-"))
 	s2i++;
@@ -1869,23 +1895,23 @@ setup_attach_content(CT ct, char *filename)
 
     switch (ct->c_type = s2i->si_val) {
     case CT_MULTIPART:
-    	adios (NULL, "multipart types must be specified by mhbuild directives");
+	adios (NULL, "multipart types must be specified by mhbuild directives");
 	/* NOTREACHED */
 
     case CT_MESSAGE:
-    	if (strcasecmp(ct->c_ctinfo.ci_subtype, "partial") == 0)
+	if (strcasecmp(ct->c_ctinfo.ci_subtype, "partial") == 0)
 	    adios(NULL, "Sorry, %s/%s isn't supported", ct->c_ctinfo.ci_type,
-	    	  ct->c_ctinfo.ci_subtype);
+		ct->c_ctinfo.ci_subtype);
 	if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0)
 	    adios(NULL, "external-body messages must be specified "
-	    	  "by mhbuild directives");
+		"by mhbuild directives");
 	/* Fall through */
 
     default:
-    	/*
+	/*
 	 * This sets the subtype, if it's significant
 	 */
-    	if ((ct->c_ctinitfnx = s2i->si_init))
+	if ((ct->c_ctinitfnx = s2i->si_init))
 	    (*ct->c_ctinitfnx)(ct);
 	break;
     }
@@ -1898,14 +1924,14 @@ setup_attach_content(CT ct, char *filename)
     for (pm = ct->c_ctinfo.ci_first_pm; pm; pm = pm->pm_next) {
 	if (strcasecmp(pm->pm_name, "name") == 0) {
 	    if (pm->pm_value)
-	    	free(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,
+	add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm,
 		  "name", simplename, 0);
 
     ct->c_descr = getcpy(simplename);
@@ -1913,16 +1939,30 @@ setup_attach_content(CT ct, char *filename)
     ct->c_cefile.ce_file = getcpy(filename);
 
     /*
-     * If it's a text/calendar, we need to make sure it's an inline,
-     * otherwise it won't work with some calendar programs.  Otherwise
-     * assume attachment
+     * Look for mhbuild-disposition-<type>/<subtype> entry
+     * that specifies Content-Disposition type.  Only
+     * 'attachment' and 'inline' are allowed.  Default to
+     * 'attachment'.
      */
 
-    if (strcasecmp(ct->c_ctinfo.ci_type, "text") == 0 &&
-	strcasecmp(ct->c_ctinfo.ci_subtype, "calendar") == 0) {
-	ct->c_dispo_type = getcpy("inline");
+    cp = context_find_by_type ("disposition", ct->c_ctinfo.ci_type,
+                               ct->c_ctinfo.ci_subtype);
+    if (cp != NULL) {
+        if (strcasecmp (cp, "attachment")  &&  strcasecmp (cp, "inline")) {
+            admonish (NULL, "configuration problem: %s-disposition-%s%s%s "
+                      "specifies '%s' but only 'attachment' and 'inline' are "
+                      "allowed", invo_name,
+                      ct->c_ctinfo.ci_type,
+                      ct->c_ctinfo.ci_subtype ? "/" : "",
+                      ct->c_ctinfo.ci_subtype ? ct->c_ctinfo.ci_subtype : "",
+                      cp);
+        }
+    }
+
+    if (cp) {
+	ct->c_dispo_type = getcpy(cp);
     } else {
-    	ct->c_dispo_type = getcpy("attachment");
+	ct->c_dispo_type = getcpy("attachment");
     }
 
     add_param(&ct->c_dispo_first, &ct->c_dispo_last, "filename", simplename, 0);