X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5b035a57c6f503870fa01242724c20ef907bc35c..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 4b11494e..8dbc2ecc 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -126,11 +126,12 @@ show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly)
 	ct = *ctp;
 
 	/* if top-level type is ok, then display message */
-	if (type_ok (ct, 1))
+	if (type_ok (ct, 1)) {
 	    if (headersw) output_header(ct, hfmt);
 
 	    show_single_message (ct, formsw, concatsw, textonly, inlineonly,
 				 mfmt);
+	}
     }
 
     free_markercomps();
@@ -205,9 +206,9 @@ DisplayMsgHeader (CT ct, char *form, int concatsw)
     char *file;
 
     vec = argsplit(mhlproc, &file, &vecp);
-    vec[vecp++] = getcpy("-form");
-    vec[vecp++] = getcpy(form);
-    vec[vecp++] = getcpy("-nobody");
+    vec[vecp++] = mh_xstrdup("-form");
+    vec[vecp++] = mh_xstrdup(form);
+    vec[vecp++] = mh_xstrdup("-nobody");
     vec[vecp++] = getcpy(ct->c_file);
 
     /*
@@ -215,10 +216,10 @@ DisplayMsgHeader (CT ct, char *form, int concatsw)
      * then just pass that along.
      */
     if (nomore || concatsw) {
-	vec[vecp++] = getcpy("-nomoreproc");
+	vec[vecp++] = mh_xstrdup("-nomoreproc");
     } else if (progsw) {
-	vec[vecp++] = getcpy("-moreproc");
-	vec[vecp++] = getcpy(progsw);
+	vec[vecp++] = mh_xstrdup("-moreproc");
+	vec[vecp++] = mh_xstrdup(progsw);
     }
     vec[vecp] = NULL;
 
@@ -369,7 +370,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format *
                 return NOTOK;
         } else {
             char *charset = content_charset (ct);
-            admonish (NULL, "unable to convert character set%s%s to %s",
+            admonish (NULL, "unable to convert character set%s%s from %s",
                       ct->c_partno  ?  " of part "  :  "",
                       ct->c_partno  ?  ct->c_partno  :  "",
                       charset);
@@ -1080,6 +1081,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
 	char *dest_buffer = mh_xmalloc(dest_buffer_size);
         HF hf;
         char *tempfile;
+	int fromutf8 = !strcasecmp(src_charset, "UTF-8");
 
         if ((conv_desc = iconv_open (dest_charset, src_charset)) ==
             (iconv_t) -1) {
@@ -1149,6 +1151,32 @@ iconv_start:
 			outbytes_before += bumpup;
 			goto iconv_start;
 		    }
+		    if (errno == EINVAL) {
+			/* middle of multi-byte sequence */
+			if (write (fd, dest_buffer, outbytes_before - outbytes) < 0) {
+			    advise (dest, "write");
+			}
+			fseeko (*fp, -inbytes, SEEK_CUR);
+			if (end > 0) bytes_to_read += inbytes;
+			/* advise(NULL, "convert_charset: EINVAL"); */
+			continue;
+		    }
+		    if (errno == EILSEQ) {
+			/* invalid multi-byte sequence */
+			if (fromutf8) {
+			    for (++ib, --inbytes;
+				 inbytes > 0 &&
+					(((unsigned char) *ib) & 0xc0) == 0x80;
+				 ++ib, --inbytes)
+				continue;
+			} else {
+			    ib++; inbytes--; /* skip it */
+			}
+			(*ob++) = '?'; outbytes --;
+			/* advise(NULL, "convert_charset: EILSEQ"); */
+			goto iconv_start;
+		    }
+		    advise (NULL, "convert_charset: errno = %d", errno);
                     status = NOTOK;
                     break;
                 } else {
@@ -1238,20 +1266,22 @@ convert_content_charset (CT ct, char **file) {
     /* Using current locale, see if the content needs to be converted. */
 
     /* content_charset() cannot return NULL. */
-    char *charset = content_charset (ct);
+    char *src_charset = content_charset (ct);
 
-    if (! check_charset (charset, strlen (charset))) {
+    if (! check_charset (src_charset, strlen (src_charset))) {
         int unused = 0;
 
-        char *charset = getcpy (get_charset ());
+        char *dest_charset = getcpy (get_charset ());
 
-        if (convert_charset (ct, charset, &unused) == 0) {
+        if (convert_charset (ct, dest_charset, &unused) == 0) {
             *file = ct->c_cefile.ce_file;
         } else {
             status = NOTOK;
         }
+
+        free (dest_charset);
     }
-    free (charset);
+    free (src_charset);
 #else  /* ! HAVE_ICONV */
     NMH_UNUSED (ct);
     NMH_UNUSED (file);
@@ -1329,15 +1359,15 @@ compile_marker(char *form)
 	    dispo_comp = comp;
 	} else if (strncasecmp(comp->c_name, "ctype-", 6) == 0 &&
 		   strlen(comp->c_name) > 6) {
-	    pc_entry = mh_xmalloc(sizeof(*pc_entry));
-	    pc_entry->param = getcpy(comp->c_name + 6);
+	    NEW(pc_entry);
+	    pc_entry->param = mh_xstrdup(comp->c_name + 6);
 	    pc_entry->comp = comp;
 	    pc_entry->next = ctype_pc_list;
 	    ctype_pc_list = pc_entry;
 	} else if (strncasecmp(comp->c_name, "cdispo-", 7) == 0 &&
 		   strlen(comp->c_name) > 7) {
-	    pc_entry = mh_xmalloc(sizeof(*pc_entry));
-	    pc_entry->param = getcpy(comp->c_name + 7);
+	    NEW(pc_entry);
+	    pc_entry->param = mh_xstrdup(comp->c_name + 7);
 	    pc_entry->comp = comp;
 	    pc_entry->next = dispo_pc_list;
 	    dispo_pc_list = pc_entry;
@@ -1355,12 +1385,10 @@ static void
 output_header(CT ct, struct format *fmt)
 {
     charstring_t outbuf = charstring_create (BUFSIZ);
-    int dat[5];
+    int dat[5] = { 0 };
     char *endp;
     int message = 0;
 
-    dat[0] = dat[1] = dat[2] = dat[3] = dat[4] = dat[5] = 0;
-
     if (folder_comp)
 	folder_comp->c_text = getcpy(folder);
 
@@ -1392,9 +1420,7 @@ output_marker(CT ct, struct format *fmt, int hidden)
     int partsize;
     int message = 0;
     char *endp;
-    int dat[5];
-
-    dat[0] = dat[1] = dat[2] = dat[3] = dat[4] = dat[5] = 0;
+    int dat[5] = { 0 };
 
     /*
      * Grab any items we care about.
@@ -1406,15 +1432,15 @@ output_marker(CT ct, struct format *fmt, int hidden)
     }
 
     if (part_comp && ct->c_partno) {
-	part_comp->c_text = getcpy(ct->c_partno);
+	part_comp->c_text = mh_xstrdup(ct->c_partno);
     }
 
     if (description_comp && ct->c_descr) {
-	description_comp->c_text = getcpy(ct->c_descr);
+	description_comp->c_text = mh_xstrdup(ct->c_descr);
     }
 
     if (dispo_comp && ct->c_dispo_type) {
-	dispo_comp->c_text = getcpy(ct->c_dispo_type);
+	dispo_comp->c_text = mh_xstrdup(ct->c_dispo_type);
     }
 
     for (pcentry = ctype_pc_list; pcentry != NULL; pcentry = pcentry->next) {