Fix to commit b828fcb1695393007a75c41d32b2173c296be9d7: a couple

[nmh] / uip / mhfixmsg.c

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 4c0a3ef53f6e1135427cc3989f246c17718f571d..d1d796c1762412856c4dc623ac7b0029e8a828d2 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -16,8 +16,8 @@
 #define MHFIXMSG_SWITCHES \
     X("decodetext 8bit|7bit", 0, DECODETEXTSW) \
     X("nodecodetext", 0, NDECODETEXTSW) \
 #define MHFIXMSG_SWITCHES \
     X("decodetext 8bit|7bit", 0, DECODETEXTSW) \
     X("nodecodetext", 0, NDECODETEXTSW) \

-    X("textcodeset", 0, TEXTCODESETSW) \
-    X("notextcodeset", 0, NTEXTCODESETSW) \
+    X("textcharset", 0, TEXTCHARSETSW) \
+    X("notextcharset", 0, NTEXTCHARSETSW) \

     X("reformat", 0, REFORMATSW) \
     X("noreformat", 0, NREFORMATSW) \
     X("replacetextplain", 0, REPLACETEXTPLAINSW) \
     X("reformat", 0, REFORMATSW) \
     X("noreformat", 0, NREFORMATSW) \
     X("replacetextplain", 0, REPLACETEXTPLAINSW) \


@@ -60,7 +60,7 @@ void reverse_parts (CT);
 int output_message (CT, char *);
 
 /* mhshowsbr.c */
 int output_message (CT, char *);
 
 /* mhshowsbr.c */

-int show_content_aux (CT, int, int, char *, char *);
+int show_content_aux (CT, int, char *, char *);

 
 /* mhmisc.c */
 void flush_errors (void);
 
 /* mhmisc.c */
 void flush_errors (void);


@@ -78,14 +78,14 @@ typedef struct fix_transformations {
     int reformat;
     int replacetextplain;
     int decodetext;
     int reformat;
     int replacetextplain;
     int decodetext;

-    char *textcodeset;
+    char *textcharset;

 } fix_transformations;
 
 int mhfixmsgsbr (CT *, const fix_transformations *, char *);
 static void reverse_alternative_parts (CT);
 static int fix_boundary (CT *, int *);
 static int get_multipart_boundary (CT, char **);
 } fix_transformations;
 
 int mhfixmsgsbr (CT *, const fix_transformations *, char *);
 static void reverse_alternative_parts (CT);
 static int fix_boundary (CT *, int *);
 static int get_multipart_boundary (CT, char **);

-static int replace_boundary (CT, char *, const char *);
+static int replace_boundary (CT, char *, char *);

 static int fix_multipart_cte (CT, int *);
 static int set_ce (CT, int);
 static int ensure_text_plain (CT *, CT, int *, int);
 static int fix_multipart_cte (CT, int *);
 static int set_ce (CT, int);
 static int ensure_text_plain (CT *, CT, int *, int);


@@ -100,12 +100,12 @@ static int boundary_in_content (FILE **, char *, const char *);
 static void transfer_noncontent_headers (CT, CT);
 static int set_ct_type (CT, int type, int subtype, int encoding);
 static int decode_text_parts (CT, int, int *);
 static void transfer_noncontent_headers (CT, CT);
 static int set_ct_type (CT, int type, int subtype, int encoding);
 static int decode_text_parts (CT, int, int *);

-static int content_encoding (CT);
+static int content_encoding (CT, const char **);

 static int strip_crs (CT, int *);
 static int strip_crs (CT, int *);

-static int convert_codesets (CT, char *, int *);
+static int convert_charsets (CT, char *, int *);

 static int write_content (CT, char *, char *, int, int);
 static int remove_file (char *);
 static int write_content (CT, char *, char *, int, int);
 static int remove_file (char *);

-static void report (char *, char *, char *, ...);
+static void report (char *, char *, char *, char *, ...);

 static void pipeser (int);
 
 
 static void pipeser (int);
 
 


@@ -125,7 +125,7 @@ main (int argc, char **argv) {
     fx.reformat = fx.fixcte = fx.fixboundary = 1;
     fx.replacetextplain = 0;
     fx.decodetext = CE_8BIT;
     fx.reformat = fx.fixcte = fx.fixboundary = 1;
     fx.replacetextplain = 0;
     fx.decodetext = CE_8BIT;

-    fx.textcodeset = NULL;
+    fx.textcharset = NULL;

 
     if (nmh_init(argv[0], 1)) { return 1; }
 
 
     if (nmh_init(argv[0], 1)) { return 1; }
 


@@ -169,13 +169,13 @@ main (int argc, char **argv) {
             case NDECODETEXTSW:
                 fx.decodetext = 0;
                 continue;
             case NDECODETEXTSW:
                 fx.decodetext = 0;
                 continue;

-            case TEXTCODESETSW:
+            case TEXTCHARSETSW:

                 if (! (cp = *argp++) || (*cp == '-' && cp[1]))
                     adios (NULL, "missing argument to %s", argp[-2]);
                 if (! (cp = *argp++) || (*cp == '-' && cp[1]))
                     adios (NULL, "missing argument to %s", argp[-2]);

-                fx.textcodeset = cp;
+                fx.textcharset = cp;

                 continue;
                 continue;

-            case NTEXTCODESETSW:
-                fx.textcodeset = 0;
+            case NTEXTCHARSETSW:
+                fx.textcharset = 0;

                 continue;
             case FIXBOUNDARYSW:
                 fx.fixboundary = 1;
                 continue;
             case FIXBOUNDARYSW:
                 fx.fixboundary = 1;


@@ -408,8 +408,8 @@ mhfixmsgsbr (CT *ctp, const fix_transformations *fx, char *outfile) {
     if (status == OK  &&  fx->decodetext) {
         status = decode_text_parts (*ctp, fx->decodetext, &message_mods);
     }
     if (status == OK  &&  fx->decodetext) {
         status = decode_text_parts (*ctp, fx->decodetext, &message_mods);
     }

-    if (status == OK  &&  fx->textcodeset != NULL) {
-        status = convert_codesets (*ctp, fx->textcodeset, &message_mods);
+    if (status == OK  &&  fx->textcharset != NULL) {
+        status = convert_charsets (*ctp, fx->textcharset, &message_mods);

     }
 
     if (! (*ctp)->c_umask) {
     }
 
     if (! (*ctp)->c_umask) {


@@ -516,7 +516,7 @@ fix_boundary (CT *ct, int *message_mods) {
 
                             ++*message_mods;
                             if (verbosw) {
 
                             ++*message_mods;
                             if (verbosw) {

-                                report (NULL, filename,
+                                report (NULL, NULL, filename,

                                         "fix multipart boundary");
                             }
                         }
                                         "fix multipart boundary");
                             }
                         }


@@ -563,10 +563,11 @@ get_multipart_boundary (CT ct, char **part_boundary) {
     while (begin >= (off_t) ct->c_begin) {
         fseeko (ct->c_fp, begin, SEEK_SET);
         while ((bytes_read = fread (buffer, 1, sizeof buffer, ct->c_fp)) > 0) {
     while (begin >= (off_t) ct->c_begin) {
         fseeko (ct->c_fp, begin, SEEK_SET);
         while ((bytes_read = fread (buffer, 1, sizeof buffer, ct->c_fp)) > 0) {

-            char *end = buffer + bytes_read - 1;
-            char *cp;
+            char *cp = rfind_str (buffer, bytes_read, "--");
+
+            if (cp) {
+                char *end;

 
 

-            if ((cp = rfind_str (buffer, bytes_read, "--"))) {

                 /* Trim off trailing "--" and anything beyond. */
                 *cp-- = '\0';
                 if ((end = rfind_str (buffer, cp - buffer, "\n"))) {
                 /* Trim off trailing "--" and anything beyond. */
                 *cp-- = '\0';
                 if ((end = rfind_str (buffer, cp - buffer, "\n"))) {


@@ -622,7 +623,7 @@ get_multipart_boundary (CT ct, char **part_boundary) {
 
 /* Open and copy ct->c_file to file, replacing the multipart boundary. */
 static int
 
 /* Open and copy ct->c_file to file, replacing the multipart boundary. */
 static int

-replace_boundary (CT ct, char *file, const char *boundary) {
+replace_boundary (CT ct, char *file, char *boundary) {

     FILE *fpin, *fpout;
     int compnum, state;
     char buf[BUFSIZ], name[NAMESZ];
     FILE *fpin, *fpout;
     int compnum, state;
     char buf[BUFSIZ], name[NAMESZ];


@@ -668,10 +669,22 @@ replace_boundary (CT ct, char *file, const char *boundary) {
             if (strcasecmp (TYPE_FIELD, np)) {
                 fprintf (fpout, "%s:%s", np, vp);
             } else {
             if (strcasecmp (TYPE_FIELD, np)) {
                 fprintf (fpout, "%s:%s", np, vp);
             } else {

-                char *new_boundary = update_attr (vp, "boundary=", boundary);
-
-                fprintf (fpout, "%s:%s\n", np, new_boundary);
-                free (new_boundary);
+               char *new_ctline, *new_params;
+
+               replace_param(&ct->c_ctinfo.ci_first_pm,
+                             &ct->c_ctinfo.ci_last_pm, "boundary",
+                             boundary, 0);
+
+               new_ctline = concat(" ", ct->c_ctinfo.ci_type, "/",
+                                   ct->c_ctinfo.ci_subtype, NULL);
+               new_params = output_params(strlen(TYPE_FIELD) +
+                                          strlen(new_ctline) + 1,
+                                          ct->c_ctinfo.ci_first_pm, NULL, 0);
+                fprintf (fpout, "%s:%s%s\n", np, new_ctline,
+                        new_params ? new_params : "");
+               free(new_ctline);
+               if (new_params)
+                   free(new_params);

             }
 
             free (vp);
             }
 
             free (vp);


@@ -746,7 +759,7 @@ fix_multipart_cte (CT ct, int *message_mods) {
                     ++*message_mods;
                     if (verbosw) {
                         char *encoding = cpytrim (hf->value);
                     ++*message_mods;
                     if (verbosw) {
                         char *encoding = cpytrim (hf->value);

-                        report (ct->c_partno, ct->c_file,
+                        report (NULL, ct->c_partno, ct->c_file,

                                 "replace Content-Transfer-Encoding of %s "
                                 "with 8 bit", encoding);
                         free (encoding);
                                 "replace Content-Transfer-Encoding of %s "
                                 "with 8 bit", encoding);
                         free (encoding);


@@ -860,7 +873,7 @@ ensure_text_plain (CT *ct, CT parent, int *message_mods, int replacetextplain) {
                             prev->mp_next = part->mp_next;
                         }
                         if (verbosw) {
                             prev->mp_next = part->mp_next;
                         }
                         if (verbosw) {

-                            report (parent->c_partno, parent->c_file,
+                            report (NULL, parent->c_partno, parent->c_file,

                                     "remove text/plain part %s",
                                     old_part->mp_part->c_partno);
                         }
                                     "remove text/plain part %s",
                                     old_part->mp_part->c_partno);
                         }


@@ -891,7 +904,7 @@ ensure_text_plain (CT *ct, CT parent, int *message_mods, int replacetextplain) {
 
                     ++*message_mods;
                     if (verbosw) {
 
                     ++*message_mods;
                     if (verbosw) {

-                        report (parent->c_partno, parent->c_file,
+                        report (NULL, parent->c_partno, parent->c_file,

                                 "insert text/plain part");
                     }
                 } else {
                                 "insert text/plain part");
                     }
                 } else {


@@ -918,7 +931,7 @@ ensure_text_plain (CT *ct, CT parent, int *message_mods, int replacetextplain) {
 
                         ++*message_mods;
                         if (verbosw) {
 
                         ++*message_mods;
                         if (verbosw) {

-                            report ((*ct)->c_partno, (*ct)->c_file,
+                            report (NULL, (*ct)->c_partno, (*ct)->c_file,

                                     "insert text/plain part");
                         }
                     } else {
                                     "insert text/plain part");
                         }
                     } else {


@@ -1028,19 +1041,19 @@ divide_part (CT ct) {
 
 static void
 copy_ctinfo (CI dest, CI src) {
 
 static void
 copy_ctinfo (CI dest, CI src) {

-    char **s_ap, **d_ap, **s_vp, **d_vp;
+    PM s_pm, d_pm;

 
     dest->ci_type = src->ci_type ? add (src->ci_type, NULL) : NULL;
     dest->ci_subtype = src->ci_subtype ? add (src->ci_subtype, NULL) : NULL;
 
 
     dest->ci_type = src->ci_type ? add (src->ci_type, NULL) : NULL;
     dest->ci_subtype = src->ci_subtype ? add (src->ci_subtype, NULL) : NULL;
 

-    for (s_ap = src->ci_attrs, d_ap = dest->ci_attrs,
-             s_vp = src->ci_values, d_vp = dest->ci_values;
-         *s_ap;
-         ++s_ap, ++d_ap, ++s_vp, ++d_vp) {
-        *d_ap = add (*s_ap, NULL);
-        *d_vp = *s_vp;
+    for (s_pm = src->ci_first_pm; s_pm; s_pm = s_pm->pm_next) {
+       d_pm = add_param(&dest->ci_first_pm, &dest->ci_last_pm, s_pm->pm_name,
+                        s_pm->pm_value, 0);
+       if (s_pm->pm_charset)
+           d_pm->pm_charset = getcpy(s_pm->pm_charset);
+       if (s_pm->pm_lang)
+           d_pm->pm_lang = getcpy(s_pm->pm_lang);

     }
     }

-    *d_ap = NULL;

 
     dest->ci_comment = src->ci_comment ? add (src->ci_comment, NULL) : NULL;
     dest->ci_magic = src->ci_magic ? add (src->ci_magic, NULL) : NULL;
 
     dest->ci_comment = src->ci_comment ? add (src->ci_comment, NULL) : NULL;
     dest->ci_magic = src->ci_magic ? add (src->ci_magic, NULL) : NULL;


@@ -1115,7 +1128,7 @@ reformat_part (CT ct, char *file, char *type, char *subtype, int c_type) {
     free (cp);
 
     cp = concat (cf, " >", file, NULL);
     free (cp);
 
     cp = concat (cf, " >", file, NULL);

-    status = show_content_aux (ct, 1, 0, cp, NULL);
+    status = show_content_aux (ct, 0, cp, NULL);

     free (cp);
 
     /* Unlink decoded content tmp file and free its filename to avoid
     free (cp);
 
     /* Unlink decoded content tmp file and free its filename to avoid


@@ -1150,12 +1163,9 @@ reformat_part (CT ct, char *file, char *type, char *subtype, int c_type) {
 /* Identifies 7bit or 8bit content based on charset. */
 static int
 charset_encoding (CT ct) {
 /* Identifies 7bit or 8bit content based on charset. */
 static int
 charset_encoding (CT ct) {

-    /* norm_charmap() is case sensitive. */
-    char *codeset = upcase (content_charset (ct));

     int encoding =
     int encoding =

-        strcmp (norm_charmap (codeset), "US-ASCII")  ?  CE_8BIT  :  CE_7BIT;
+        strcasecmp (content_charset (ct), "US-ASCII")  ?  CE_8BIT  :  CE_7BIT;

 
 

-    free (codeset);

     return encoding;
 }
 
     return encoding;
 }
 


@@ -1169,7 +1179,6 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
     CT ct;
     struct part *p;
     struct multipart *m;
     CT ct;
     struct part *p;
     struct multipart *m;

-    char *cp;

     const struct str2init *ctinit;
 
     if ((ct = (CT) calloc (1, sizeof *ct)) == NULL)
     const struct str2init *ctinit;
 
     if ((ct = (CT) calloc (1, sizeof *ct)) == NULL)


@@ -1184,7 +1193,7 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
        c_cefile, c_encoding,
        c_digested, c_digest[16], c_ctexbody,
        c_ctinitfnx, c_ceopenfnx, c_ceclosefnx, c_cesizefnx,
        c_cefile, c_encoding,
        c_digested, c_digest[16], c_ctexbody,
        c_ctinitfnx, c_ceopenfnx, c_ceclosefnx, c_cesizefnx,

-       c_umask, c_pid, c_rfc934,
+       c_umask, c_rfc934,

        c_showproc, c_termproc, c_storeproc, c_storage, c_folder
     */
 
        c_showproc, c_termproc, c_storeproc, c_storage, c_folder
     */
 


@@ -1211,6 +1220,7 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
                      boundary_in_content (&new_part->c_cefile.ce_fp,
                                           new_part->c_cefile.ce_file,
                                           boundary)) == -1) {
                      boundary_in_content (&new_part->c_cefile.ce_fp,
                                           new_part->c_cefile.ce_file,
                                           boundary)) == -1) {

+                    free (ct);

                     return NULL;
                 }
             }
                     return NULL;
                 }
             }


@@ -1221,6 +1231,7 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
                 if ((found_boundary = boundary_in_content (&new_part->c_fp,
                                                            new_part->c_file,
                                                            boundary)) == -1) {
                 if ((found_boundary = boundary_in_content (&new_part->c_fp,
                                                            new_part->c_file,
                                                            boundary)) == -1) {

+                    free (ct);

                     return NULL;
                 }
             }
                     return NULL;
                 }
             }


@@ -1241,6 +1252,7 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
 
         if (found_boundary) {
             advise (NULL, "giving up trying to find a unique boundary");
 
         if (found_boundary) {
             advise (NULL, "giving up trying to find a unique boundary");

+            free (ct);

             return NULL;
         }
     }
             return NULL;
         }
     }


@@ -1269,14 +1281,8 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
         ct->c_ctinfo.ci_subtype = add (subtypename, NULL);
     }
 
         ct->c_ctinfo.ci_subtype = add (subtypename, NULL);
     }
 

-    name = concat (" ", typename, "/", subtypename, boundary_indicator,
-                   boundary, NULL);
-    if ((cp = strstr (name, boundary_indicator))) {
-        ct->c_ctinfo.ci_attrs[0] = name;
-        ct->c_ctinfo.ci_attrs[1] = NULL;
-        /* ci_values don't get free'd, so point into ci_attrs. */
-        ct->c_ctinfo.ci_values[0] = cp + strlen (boundary_indicator);
-    }
+    add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm,
+             "boundary", boundary, 0);

 
     p = (struct part *) mh_xmalloc (sizeof *p);
     p->mp_next = (struct part *) mh_xmalloc (sizeof *p->mp_next);
 
     p = (struct part *) mh_xmalloc (sizeof *p);
     p->mp_next = (struct part *) mh_xmalloc (sizeof *p->mp_next);


@@ -1430,16 +1436,19 @@ decode_text_parts (CT ct, int encoding, int *message_mods) {
             int ct_encoding;
 
             if (decode_part (ct) == OK  &&  ct->c_cefile.ce_file) {
             int ct_encoding;
 
             if (decode_part (ct) == OK  &&  ct->c_cefile.ce_file) {

-                if ((ct_encoding = content_encoding (ct)) == CE_BINARY  &&
-                    encoding != CE_BINARY) {
+                const char *reason = NULL;
+
+                if ((ct_encoding = content_encoding (ct, &reason)) == CE_BINARY
+                    &&  encoding != CE_BINARY) {

                     /* The decoding isn't acceptable so discard it.
                        Leave status as OK to allow other transformations. */
                     if (verbosw) {
                     /* The decoding isn't acceptable so discard it.
                        Leave status as OK to allow other transformations. */
                     if (verbosw) {

-                        report (ct->c_partno, ct->c_file,
-                                "will not decode%s because it is binary",
+                        report (NULL, ct->c_partno, ct->c_file,
+                                "will not decode%s because it is binary (%s)",

                                 ct->c_partno  ?  ""
                                               :  ct->c_ctline  ?  ct->c_ctline
                                 ct->c_partno  ?  ""
                                               :  ct->c_ctline  ?  ct->c_ctline

-                                                               :  "");
+                                                               :  "",
+                                reason);

                     }
                     (void) m_unlink (ct->c_cefile.ce_file);
                     free (ct->c_cefile.ce_file);
                     }
                     (void) m_unlink (ct->c_cefile.ce_file);
                     free (ct->c_cefile.ce_file);


@@ -1449,7 +1458,7 @@ decode_text_parts (CT ct, int encoding, int *message_mods) {
                     /* The decoding isn't acceptable so discard it.
                        Leave status as OK to allow other transformations. */
                     if (verbosw) {
                     /* The decoding isn't acceptable so discard it.
                        Leave status as OK to allow other transformations. */
                     if (verbosw) {

-                        report (ct->c_partno, ct->c_file,
+                        report (NULL, ct->c_partno, ct->c_file,

                                 "will not decode%s because it is 8bit",
                                 ct->c_partno  ?  ""
                                               :  ct->c_ctline  ?  ct->c_ctline
                                 "will not decode%s because it is 8bit",
                                 ct->c_partno  ?  ""
                                               :  ct->c_ctline  ?  ct->c_ctline


@@ -1469,7 +1478,7 @@ decode_text_parts (CT ct, int encoding, int *message_mods) {
                     if (set_ce (ct, enc) == OK) {
                         ++*message_mods;
                         if (verbosw) {
                     if (set_ce (ct, enc) == OK) {
                         ++*message_mods;
                         if (verbosw) {

-                            report (ct->c_partno, ct->c_file, "decode%s",
+                            report (NULL, ct->c_partno, ct->c_file, "decode%s",

                                     ct->c_ctline ? ct->c_ctline : "");
                         }
                         strip_crs (ct, message_mods);
                                     ct->c_ctline ? ct->c_ctline : "");
                         }
                         strip_crs (ct, message_mods);


@@ -1523,9 +1532,10 @@ decode_text_parts (CT ct, int encoding, int *message_mods) {
 
 /* See if the decoded content is 7bit, 8bit, or binary.  It's binary
    if it has any NUL characters, a CR not followed by a LF, or lines
 
 /* See if the decoded content is 7bit, 8bit, or binary.  It's binary
    if it has any NUL characters, a CR not followed by a LF, or lines

-   greater than 998 characters in length. */
+   greater than 998 characters in length.  If binary, reason is set
+   to a string explaining why. */

 static int
 static int

-content_encoding (CT ct) {
+content_encoding (CT ct, const char **reason) {

     CE ce = &ct->c_cefile;
     int encoding = CE_7BIT;
 
     CE ce = &ct->c_cefile;
     int encoding = CE_7BIT;
 


@@ -1550,6 +1560,16 @@ content_encoding (CT ct) {
                 if (*cp == '\0'  ||  ++line_len > 998  ||
                     (*cp != '\n'  &&  last_char_was_cr)) {
                     encoding = CE_BINARY;
                 if (*cp == '\0'  ||  ++line_len > 998  ||
                     (*cp != '\n'  &&  last_char_was_cr)) {
                     encoding = CE_BINARY;

+                    if (*cp == '\0') {
+                        *reason = "null character";
+                    } else if (line_len > 998) {
+                        *reason = "line length > 998";
+                    } else if (*cp != '\n'  &&  last_char_was_cr) {
+                        *reason = "CR not followed by LF";
+                    } else {
+                        /* Should not reach this. */
+                        *reason = "";
+                    }

                     break;
                 } else if (*cp == '\n') {
                     line_len = 0;
                     break;
                 } else if (*cp == '\n') {
                     line_len = 0;


@@ -1571,19 +1591,18 @@ content_encoding (CT ct) {
 
 static int
 strip_crs (CT ct, int *message_mods) {
 
 static int
 strip_crs (CT ct, int *message_mods) {

-    /* norm_charmap() is case sensitive. */
-    char *codeset = upcase (content_charset (ct));
+    char *charset = content_charset (ct);

     int status = OK;
 
     /* Only strip carriage returns if content is ASCII or another
     int status = OK;
 
     /* Only strip carriage returns if content is ASCII or another

-       codeset that has the same readily recognizable CR followed by a
+       charset that has the same readily recognizable CR followed by a

        LF.  We can include UTF-8 here because if the high-order bit of
        a UTF-8 byte is 0, then it must be a single-byte ASCII
        character. */
        LF.  We can include UTF-8 here because if the high-order bit of
        a UTF-8 byte is 0, then it must be a single-byte ASCII
        character. */

-    if (! strcmp (norm_charmap (codeset), "US-ASCII")  ||
-        ! strncmp (norm_charmap (codeset), "ISO-8859-", 9)  ||
-        ! strncmp (norm_charmap (codeset), "UTF-8", 5)  ||
-        ! strncmp (norm_charmap (codeset), "WINDOWS-12", 10)) {
+    if (! strcasecmp (charset, "US-ASCII")  ||
+        ! strcasecmp (charset, "UTF-8")  ||
+        ! strncasecmp (charset, "ISO-8859-", 9)  ||
+        ! strncasecmp (charset, "WINDOWS-12", 10)) {

         char **file = NULL;
         FILE **fp = NULL;
         size_t begin;
         char **file = NULL;
         FILE **fp = NULL;
         size_t begin;


@@ -1645,7 +1664,7 @@ strip_crs (CT ct, int *message_mods) {
             if (has_crs) {
                 int fd;
                 char *stripped_content_file;
             if (has_crs) {
                 int fd;
                 char *stripped_content_file;

-                char *tempfile = m_mktemp2 (NULL, invo_name, &fd, NULL); 
+                char *tempfile = m_mktemp2 (NULL, invo_name, &fd, NULL);

 
                 if (tempfile == NULL) {
                     adios (NULL, "unable to create temporary file in %s",
 
                 if (tempfile == NULL) {
                     adios (NULL, "unable to create temporary file in %s",


@@ -1693,7 +1712,7 @@ strip_crs (CT ct, int *message_mods) {
 
                     ++*message_mods;
                     if (verbosw) {
 
                     ++*message_mods;
                     if (verbosw) {

-                        report (ct->c_partno,
+                        report (NULL, ct->c_partno,

                                 begin == 0 && end == 0  ?  ""  :  *file,
                                 "stripped CRs");
                     }
                                 begin == 0 && end == 0  ?  ""  :  *file,
                                 "stripped CRs");
                     }


@@ -1707,22 +1726,28 @@ strip_crs (CT ct, int *message_mods) {
         }
     }
 
         }
     }
 

-    free (codeset);

     return status;
 }
 
 
 static int
     return status;
 }
 
 
 static int

-convert_codesets (CT ct, char *dest_codeset, int *message_mods) {
+convert_charsets (CT ct, char *dest_charset, int *message_mods) {

     int status = OK;
 
     switch (ct->c_type) {
     case CT_TEXT:
         if (ct->c_subtype == TEXT_PLAIN) {
     int status = OK;
 
     switch (ct->c_type) {
     case CT_TEXT:
         if (ct->c_subtype == TEXT_PLAIN) {

-            status = convert_charset (ct, dest_codeset, message_mods);
-            if (verbosw  &&  status == OK) {
-               report (ct->c_partno, ct->c_file, "convert %s to %s",
-                       content_charset(ct), dest_codeset);
+            status = convert_charset (ct, dest_charset, message_mods);
+            if (status == OK) {
+                if (verbosw) {
+                    report (NULL, ct->c_partno, ct->c_file,
+                            "convert %s to %s",
+                            content_charset(ct), dest_charset);
+                }
+            } else {
+                report ("iconv", ct->c_partno, ct->c_file,
+                        "failed to convert %s to %s",
+                        content_charset(ct), dest_charset);

             }
         }
         break;
             }
         }
         break;


@@ -1735,7 +1760,7 @@ convert_codesets (CT ct, char *dest_codeset, int *message_mods) {
            For now, it gets passed along as-is by InitMultiPart(). */
         for (part = m->mp_parts; status == OK  &&  part; part = part->mp_next) {
             status =
            For now, it gets passed along as-is by InitMultiPart(). */
         for (part = m->mp_parts; status == OK  &&  part; part = part->mp_next) {
             status =

-                convert_codesets (part->mp_part, dest_codeset, message_mods);
+                convert_charsets (part->mp_part, dest_charset, message_mods);

         }
         break;
     }
         }
         break;
     }


@@ -1746,7 +1771,7 @@ convert_codesets (CT ct, char *dest_codeset, int *message_mods) {
 
             e = (struct exbody *) ct->c_ctparams;
             status =
 
             e = (struct exbody *) ct->c_ctparams;
             status =

-                convert_codesets (e->eb_content, dest_codeset, message_mods);
+                convert_charsets (e->eb_content, dest_charset, message_mods);

         }
         break;
 
         }
         break;
 


@@ -1854,7 +1879,7 @@ remove_file (char *file) {
 
 
 static void
 
 
 static void

-report (char *partno, char *filename, char *message, ...) {
+report (char *what, char *partno, char *filename, char *message, ...) {

     va_list args;
     char *fmt;
 
     va_list args;
     char *fmt;
 


@@ -1863,7 +1888,7 @@ report (char *partno, char *filename, char *message, ...) {
         fmt = concat (filename, partno ? " part " : ", ",
                       partno ? partno : "", partno ? ", " : "", message, NULL);
 
         fmt = concat (filename, partno ? " part " : ", ",
                       partno ? partno : "", partno ? ", " : "", message, NULL);
 

-        advertise (NULL, NULL, fmt, args);
+        advertise (what, NULL, fmt, args);

 
         free (fmt);
         va_end (args);
 
         free (fmt);
         va_end (args);