Yozo TODA: fix for mhshow-charset- directives in .mh_profile being broken

diff --git a/h/mhparse.h b/h/mhparse.h
index 48f221fcb15b913a4c2b5474508d9eabce8db438..5a5a2199a4a61c22dd41637978b0363765201d2d 100644 (file)
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -162,10 +162,8 @@ struct Content {
 #define TEXT_ENRICHED  0x03
 
 /* Flags for character sets */
 #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_UNSPECIFIED 0x01  /* only needed when building drafts */

-#define        CHARSET_USASCII     0x01
-#define        CHARSET_LATIN       0x02

 
 /* Structure for text content */
 struct text {
 
 /* Structure for text content */
 struct text {

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 0ebdaba6623722515119be86400d9884681866ec..6a7443e9f11d0a9aa29ae6b8a34d81a7a06970cb 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -1358,12 +1358,11 @@ scan_content (CT ct)
                continue;
 
            if (contains8bit) {
                continue;
 
            if (contains8bit) {

-               t->tx_charset = CHARSET_UNKNOWN;

                *ap = concat ("charset=", write_charset_8bit(), NULL);
            } else {
                *ap = concat ("charset=", write_charset_8bit(), NULL);
            } else {

-               t->tx_charset = CHARSET_USASCII;

                *ap = add ("charset=us-ascii", NULL);
            }
                *ap = add ("charset=us-ascii", NULL);
            }

+           t->tx_charset = CHARSET_SPECIFIED;

 
            cp = strchr(*ap++, '=');
            *ap = NULL;
 
            cp = strchr(*ap++, '=');
            *ap = NULL;

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 25bbad753ab7cd923069b8d85056b675c2ee636c..8cfa89980ee9e37d8fee9a61104ab107124f5aaa 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -46,11 +46,7 @@ struct k2v SubText[] = {
     { NULL,       TEXT_UNKNOWN }    /* this one must be last! */
 };
 
     { 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
 
 /*
  * Structures for MULTIPART messages


@@ -1077,14 +1073,8 @@ InitText (CT ct)
 
     /* check if content specified a character set */
     if (*ap) {
 
     /* 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;
     }
     } else {
        t->tx_charset = CHARSET_UNSPECIFIED;
     }