X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8e0f9bd3daae9d05dec58026d5a5924367e4e874..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/mhshowsbr.c diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index a87778ef..ebb295b7 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 @@ -17,13 +15,14 @@ #include #include #include +#include "mhmisc.h" +#include "mhshowsbr.h" +#include "sbr/m_mktemp.h" #ifdef HAVE_ICONV # include #endif /* ! HAVE_ICONV */ extern int debugsw; -extern int npart; -extern int ntype; int nolist = 0; @@ -33,20 +32,13 @@ char *progsw = NULL; int nomore = 0; char *formsw = NULL; -/* for output markerss and headers */ +/* for output markers and headers */ char *folder = NULL; char *markerform; char *headerform; int headersw = -1; -/* mhmisc.c */ -int part_ok (CT); -int part_exact (CT); -int type_ok (CT, int); -void content_error (char *, CT, char *, ...); -void flush_errors (void); - /* * static prototypes */ @@ -98,7 +90,7 @@ static struct param_comp_list *dispo_pc_list = NULL; */ void -show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly) +show_all_messages(CT *cts, int concat, int textonly, int inlineonly) { CT ct, *ctp; struct format *hfmt, *mfmt; @@ -126,11 +118,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, + show_single_message (ct, formsw, concat, textonly, inlineonly, mfmt); + } } free_markercomps(); @@ -200,14 +193,14 @@ static void DisplayMsgHeader (CT ct, char *form, int concatsw) { pid_t child_id; - int i, vecp; + int vecp; char **vec; 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,18 +208,16 @@ 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; fflush (stdout); - for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) - sleep (5); - + child_id = fork(); switch (child_id) { case NOTOK: adios ("fork", "unable to"); @@ -343,7 +334,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format * { int fd; int xstdin = 0, xlist = 0; - char *file = NULL, buffer[BUFSIZ]; + char *file = NULL, buffer[NMH_BUFSIZ]; if (!ct->c_ceopenfnx) { if (!alternate) @@ -369,9 +360,9 @@ 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 : "", + FENDNULL(ct->c_partno), charset); free (charset); } @@ -384,7 +375,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; } @@ -403,7 +394,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, int fd, int xlist, int xstdin, struct format *fmt) { pid_t child_id; - int i, vecp; + int vecp; char **vec, *file; if (debugsw || cracked) { @@ -434,7 +425,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 +451,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); @@ -473,8 +464,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, fflush (stdout); - for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) - sleep (5); + child_id = fork(); switch (child_id) { case NOTOK: advise ("fork", "unable to"); @@ -498,11 +488,15 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, default: { int status; + char *display_prog = vecp > 2 && vec[2][0] != '\0' + /* Copy the real display program name. This relies on the + specific construction of vec[] by argsplit(). */ + ? vec[2] + : NULL; - arglist_free(file, vec); - - pidcheck ((status = pidXwait (child_id, NULL))); + pidcheck ((status = pidXwait (child_id, display_prog))); + arglist_free(file, vec); if (fd != NOTOK) (*ct->c_ceclosefnx) (ct); return (alternate ? OK : status); @@ -538,7 +532,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); } @@ -709,7 +703,7 @@ show_multi_aux (CT ct, int alternate, char *cp, struct format *fmt) if ((*p->c_ceopenfnx) (p, &file) == NOTOK) return NOTOK; - p->c_storage = add (file, NULL); + p->c_storage = mh_xstrdup(FENDNULL(file)); if (p->c_showproc && !strcmp (p->c_showproc, "true")) return OK; @@ -719,7 +713,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 +740,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 +837,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 +891,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 +936,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 +985,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 +1077,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 +1086,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; @@ -1157,7 +1150,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) { @@ -1172,17 +1165,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"); } } @@ -1217,7 +1209,7 @@ iconv_start: replace_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm, "charset", dest_charset, 0); - outline = output_params(strlen(TYPE_FIELD) + 1 + strlen(ctline), + outline = output_params(LEN(TYPE_FIELD) + 1 + strlen(ctline), ct->c_ctinfo.ci_first_pm, NULL, 0); if (outline) { ctline = add(outline, ctline); @@ -1245,7 +1237,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; @@ -1265,20 +1257,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); @@ -1356,15 +1350,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; @@ -1429,15 +1423,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) {