From b5f46f4ba364af010a7ef5afb20b667fcbe9b136 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <okiddle@yahoo.co.uk>
Date: Tue, 20 Nov 2012 00:47:24 +0100
Subject: [PATCH] Yozo TODA: fix for mhshow-charset- directives in .mh_profile
 being broken

---
 h/mhparse.h      |    4 +---
 uip/mhbuildsbr.c |    3 +--
 uip/mhparse.c    |   16 +++-------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/h/mhparse.h b/h/mhparse.h
index 48f221f..5a5a219 100644
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -162,10 +162,8 @@ struct Content {
 #define TEXT_ENRICHED	0x03
 
 /* Flags for character sets */
-#define	CHARSET_UNKNOWN	    0x00
+#define	CHARSET_SPECIFIED    0x00
 #define CHARSET_UNSPECIFIED 0x01  /* only needed when building drafts */
-#define	CHARSET_USASCII	    0x01
-#define	CHARSET_LATIN	    0x02
 
 /* Structure for text content */
 struct text {
diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 0ebdaba..6a7443e 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -1358,12 +1358,11 @@ scan_content (CT ct)
 		continue;
 
 	    if (contains8bit) {
-		t->tx_charset = CHARSET_UNKNOWN;
 		*ap = concat ("charset=", write_charset_8bit(), NULL);
 	    } else {
-		t->tx_charset = CHARSET_USASCII;
 		*ap = add ("charset=us-ascii", NULL);
 	    }
+	    t->tx_charset = CHARSET_SPECIFIED;
 
 	    cp = strchr(*ap++, '=');
 	    *ap = NULL;
diff --git a/uip/mhparse.c b/uip/mhparse.c
index 25bbad7..8cfa899 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -46,11 +46,7 @@ struct k2v SubText[] = {
     { NULL,       TEXT_UNKNOWN }    /* this one must be last! */
 };
 
-struct k2v Charset[] = {
-    { "us-ascii",   CHARSET_USASCII },
-    { "iso-8859-1", CHARSET_LATIN },
-    { NULL,         CHARSET_UNKNOWN }  /* this one must be last! */
-};
+/* Charset[] removed -- yozo.  Mon Oct  8 01:03:41 JST 2012 */
 
 /*
  * Structures for MULTIPART messages
@@ -1077,14 +1073,8 @@ InitText (CT ct)
 
     /* check if content specified a character set */
     if (*ap) {
-	/* match character set or set to CHARSET_UNKNOWN */
-	for (kv = Charset; kv->kv_key; kv++) {
-	    if (!mh_strcasecmp (*ep, kv->kv_key)) {
-		chset = *ep;
-		break;
-	    }
-	}
-	t->tx_charset = kv->kv_value;
+	chset = *ep;
+	t->tx_charset = CHARSET_SPECIFIED;
     } else {
 	t->tx_charset = CHARSET_UNSPECIFIED;
     }
-- 
1.7.10.4