X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/adfed5f72bc07ac7de8dfc62188338d4d4f25a38..44ce2010:/uip/mhshowsbr.c?ds=sidebyside

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 02b36412..2ef4734a 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * mhshowsbr.c -- routines to display the contents of MIME messages
+/* mhshowsbr.c -- routines to display the contents of MIME messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -126,11 +124,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 +204,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 +214,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 +368,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",
+            inform("unable to convert character set%s%s from %s, continuing...",
                       ct->c_partno  ?  " of part "  :  "",
                       ct->c_partno  ?  ct->c_partno  :  "",
                       charset);
@@ -384,7 +383,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format *
 
     if (parse_display_string (ct, cp, &xstdin, &xlist, file, buffer,
     			      sizeof(buffer) - 1, 0)) {
-	admonish (NULL, "Buffer overflow constructing show command!\n");
+	inform("Buffer overflow constructing show command, continuing...");
 	return NOTOK;
     }
 
@@ -434,7 +433,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
 	char lastchar = '\n';
 
 	if (fd == NOTOK) {
-	    advise(NULL, "Cannot use NULL command to display content-type "
+	    inform("Cannot use NULL command to display content-type "
 		   "%s/%s", ct->c_ctinfo.ci_type, ct->c_ctinfo.ci_subtype);
 	    return NOTOK;
 	}
@@ -460,7 +459,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
 
 	if (strcmp(invo_name, "mhshow") == 0 && ct->c_type == CT_TEXT &&
 	    ct->c_subtype == TEXT_PLAIN && lastchar != '\n') {
-	    putc('\n', stdout);
+	    putchar('\n');
 	}
 
 	fflush(stdout);
@@ -538,7 +537,7 @@ show_text (CT ct, int alternate, int concatsw, struct format *fmt)
 	} else
 	    snprintf (buffer, sizeof(buffer), "%%l%s %%F", progsw ? progsw :
 		      moreproc && *moreproc ? moreproc : DEFAULT_PAGER);
-	cp = (ct->c_showproc = add (buffer, NULL));
+	cp = (ct->c_showproc = mh_xstrdup(buffer));
 	return show_content_aux (ct, alternate, cp, NULL, fmt);
     }
 
@@ -719,7 +718,7 @@ show_multi_aux (CT ct, int alternate, char *cp, struct format *fmt)
 
     if (parse_display_string (ct, cp, &xstdin, &xlist, file,
 			      buffer, sizeof(buffer) - 1, 1)) {
-	admonish (NULL, "Buffer overflow constructing show command!\n");
+	inform("Buffer overflow constructing show command, continuing...");
 	return NOTOK;
     }
 
@@ -746,7 +745,7 @@ show_message_rfc822 (CT ct, int alternate, struct format *fmt)
 
     /* default method for message/rfc822 */
     if (ct->c_subtype == MESSAGE_RFC822) {
-	cp = (ct->c_showproc = add ("%pshow -file %F", NULL));
+	cp = (ct->c_showproc = mh_xstrdup("%pshow -file %F"));
 	return show_content_aux (ct, alternate, cp, NULL, fmt);
     }
 
@@ -843,7 +842,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
 	    case 'F':
 		/* %f, and stdin is terminal not content */
 		*xstdin = 1;
-		/* and fall... */
+		/* FALLTHRU */
 
 	    case 'f':
 		if (multipart) {
@@ -897,7 +896,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
 
 	    case 'p':
 		/* No longer supported */
-		/* and fall... */
+		/* FALLTHRU */
 
 	    case 'l':
 		/* display listing prior to displaying content */
@@ -942,8 +941,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
 		    /* This will get confused if there are multiple %{}'s,
 		       but its real purpose is to avoid doing bad things
 		       above if a closing brace wasn't found. */
-		    admonish(NULL,
-			     "no closing brace for display string escape %s",
+		    inform("no closing brace for display string escape %s, continuing...",
 			     cp);
 		}
 		break;
@@ -992,8 +990,8 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
 			   quote. */
 			memmove (pp, pp-1, len+1);
 			*(pp++-1) = '\\';
-			buflen -= 1;
-			bp += 1;
+			buflen--;
+			bp++;
 		    }
 		}
 		/* If pp is still set, that means we ran out of space. */
@@ -1084,7 +1082,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
 
         if ((conv_desc = iconv_open (dest_charset, src_charset)) ==
             (iconv_t) -1) {
-            advise (NULL, "Can't convert %s to %s", src_charset, dest_charset);
+            inform("Can't convert %s to %s", src_charset, dest_charset);
             free (src_charset);
             return NOTOK;
         }
@@ -1093,7 +1091,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
             adios (NULL, "unable to create temporary file in %s",
                    get_temp_dir());
         }
-        dest = add (tempfile, NULL);
+        dest = mh_xstrdup(tempfile);
 
         if (ct->c_cefile.ce_file) {
             file = &ct->c_cefile.ce_file;
@@ -1152,10 +1150,12 @@ iconv_start:
 		    }
 		    if (errno == EINVAL) {
 			/* middle of multi-byte sequence */
-			write (fd, dest_buffer, outbytes_before - outbytes);
+			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"); */
+			/* inform("convert_charset: EINVAL"); */
 			continue;
 		    }
 		    if (errno == EILSEQ) {
@@ -1170,17 +1170,16 @@ iconv_start:
 			    ib++; inbytes--; /* skip it */
 			}
 			(*ob++) = '?'; outbytes --;
-			/* advise(NULL, "convert_charset: EILSEQ"); */
+			/* inform("convert_charset: EILSEQ"); */
 			goto iconv_start;
 		    }
-		    advise (NULL, "convert_charset: errno = %d", errno);
+		    inform("convert_charset: errno = %d", errno);
                     status = NOTOK;
                     break;
-                } else {
-                    if (write (fd, dest_buffer, outbytes_before - outbytes)
-                        < 0) {
-                        advise (dest, "write");
-                    }
+                }
+
+                if (write (fd, dest_buffer, outbytes_before - outbytes) < 0) {
+                    advise (dest, "write");
                 }
             }
 
@@ -1243,7 +1242,7 @@ iconv_start:
 #else  /* ! HAVE_ICONV */
         NMH_UNUSED (message_mods);
 
-        advise (NULL, "Can't convert %s to %s without iconv", src_charset,
+        inform("Can't convert %s to %s without iconv", src_charset,
                 dest_charset);
         errno = ENOSYS;
         status = NOTOK;
@@ -1263,20 +1262,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);
@@ -1354,15 +1355,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;
@@ -1427,15 +1428,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) {