X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bf989a8c437e2b510e6e02099514ae3cc1e6c2c8..40a17f8f191deee9f27fd3dd394eda9a641e6f1c:/uip/mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 7e2f9f48..77763337 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -827,14 +827,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;
@@ -1480,9 +1476,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;
 	}
     }
@@ -1863,8 +1866,7 @@ setup_attach_content(CT ct, char *filename)
     char *type, *simplename = r1bindex(filename, '/');
     struct str2init *s2i;
     PM pm;
-    char buffer[BUFSIZ], *cp;
-    int no_subtype = 0;
+    char *cp;
 
     if (! (type = mime_type(filename))) {
 	adios(NULL, "Unable to determine MIME type of \"%s\"", filename);
@@ -1944,24 +1946,16 @@ setup_attach_content(CT ct, char *filename)
      * 'attachment'.
      */
 
-    snprintf (buffer, sizeof(buffer), "%s-disposition-%s/%s",
-              invo_name, ct->c_ctinfo.ci_type, ct->c_ctinfo.ci_subtype);
-    cp = context_find (buffer);
-    if (cp == NULL || *cp == '\0') {
-        no_subtype = 1;
-        snprintf (buffer, sizeof(buffer), "%s-disposition-%s", invo_name,
-                  ct->c_ctinfo.ci_type);
-        cp = context_find (buffer);
-    }
-    if (cp != NULL && *cp != '\0') {
-        if (strcasecmp (cp, "attachment")  &&
-            strcasecmp (cp, "inline")) {
+    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,
-                      no_subtype ? "" : "/",
-                      no_subtype ? "" : ct->c_ctinfo.ci_subtype,
+                      ct->c_ctinfo.ci_subtype ? "/" : "",
+                      ct->c_ctinfo.ci_subtype ? ct->c_ctinfo.ci_subtype : "",
                       cp);
         }
     }