Make many m_getfld() buffer parameters NMH_BUFSIZ big.

[nmh] / uip / mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 8dbc2ecc0d85258ef540172173b2d815f6043673..2ef4734a649297b96579e1dc77a1526697a0292f 100644 (file)
--- 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
@@ -370,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 from %s",
+            inform("unable to convert character set%s%s from %s, continuing...",
                       ct->c_partno  ?  " of part "  :  "",
                       ct->c_partno  ?  ct->c_partno  :  "",
                       charset);
@@ -385,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;
     }
 
@@ -435,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;
        }
@@ -461,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);
@@ -539,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);
     }
 
@@ -720,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;
     }
 
@@ -747,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);
     }
 
@@ -844,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) {
@@ -898,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 */
@@ -943,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;
@@ -993,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. */
@@ -1085,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;
         }
@@ -1094,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;
@@ -1158,7 +1155,7 @@ iconv_start:
                        }
                        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) {
@@ -1173,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");
                 }
             }
 
@@ -1246,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;