[Nmh-commits] nmh/uip mhparse.c

[Eric Gillespie]

CVSROOT:        /sources/nmh
Module name:    nmh
Changes by:     Eric Gillespie <epg>    08/08/14 06:19:09

Modified files:
        uip            : mhparse.c 

Log message:
        This is what happens with last-minute "safe" improvements: actually 
point
        chset to something in the new merged InitText!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhparse.c?cvsroot=nmh&r1=1.20&r2=1.21

Patches:
Index: mhparse.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhparse.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- mhparse.c   14 Aug 2008 00:56:39 -0000      1.20
+++ mhparse.c   14 Aug 2008 06:19:08 -0000      1.21
@@ -2,7 +2,7 @@
 /*
  * mhparse.c -- routines to parse the contents of MIME messages
  *
- * $Id: mhparse.c,v 1.20 2008/08/14 00:56:39 epg Exp $
+ * $Id: mhparse.c,v 1.21 2008/08/14 06:19:08 epg Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -1058,7 +1058,7 @@
 InitText (CT ct)
 {
     char buffer[BUFSIZ];
-    char *chset;
+    char *chset = NULL;
     char **ap, **ep, *cp;
     struct k2v *kv;
     struct text *t;
@@ -1087,9 +1087,12 @@
     /* 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))
+       for (kv = Charset; kv->kv_key; kv++) {
+           if (!mh_strcasecmp (*ep, kv->kv_key)) {
+               chset = *ep;
                break;
+           }
+       }
        t->tx_charset = kv->kv_value;
     } else {
        t->tx_charset = CHARSET_UNSPECIFIED;