X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c1cdd0e7f8dae0ac256081d37322a75aff16250a..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/mhshowsbr.c diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 440fa9e7..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,6 +15,9 @@ #include #include #include +#include "mhmisc.h" +#include "mhshowsbr.h" +#include "sbr/m_mktemp.h" #ifdef HAVE_ICONV # include #endif /* ! HAVE_ICONV */ @@ -31,12 +32,12 @@ char *progsw = NULL; int nomore = 0; char *formsw = NULL; +/* for output markers and headers */ +char *folder = NULL; +char *markerform; +char *headerform; +int headersw = -1; -/* mhmisc.c */ -int part_ok (CT, int); -int type_ok (CT, int); -void content_error (char *, CT, char *, ...); -void flush_errors (void); /* * static prototypes @@ -56,7 +57,9 @@ static int show_external (CT, int, int, int, int, struct format *); static int parse_display_string (CT, char *, int *, int *, char *, char *, size_t, int multipart); static int convert_content_charset (CT, char **); +static struct format *compile_header(char *); static struct format *compile_marker(char *); +static void output_header (CT, struct format *); static void output_marker (CT, struct format *, int); static void free_markercomps (void); static int pidcheck(int); @@ -66,6 +69,7 @@ static int pidcheck(int); * content marker display. */ +static struct comp *folder_comp = NULL; static struct comp *part_comp = NULL; static struct comp *ctype_comp = NULL; static struct comp *description_comp = NULL; @@ -86,11 +90,10 @@ static struct param_comp_list *dispo_pc_list = NULL; */ void -show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly, - char *markerform) +show_all_messages(CT *cts, int concat, int textonly, int inlineonly) { CT ct, *ctp; - struct format *fmt; + struct format *hfmt, *mfmt; /* * If form is not specified, then get default form @@ -100,9 +103,10 @@ show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly, formsw = getcpy (etcpath ("mhl.headers")); /* - * Compile the content marker format line + * Compile the content marker and header format lines */ - fmt = compile_marker(markerform); + mfmt = compile_marker(markerform); + hfmt = compile_header(headerform); /* * If form is "mhl.null", suppress display of header. @@ -114,13 +118,17 @@ 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)) - show_single_message (ct, formsw, concatsw, textonly, inlineonly, - fmt); + if (type_ok (ct, 1)) { + if (headersw) output_header(ct, hfmt); + + show_single_message (ct, formsw, concat, textonly, inlineonly, + mfmt); + } } free_markercomps(); - fmt_free(fmt, 1); + fmt_free(hfmt, 1); + fmt_free(mfmt, 1); } @@ -185,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); /* @@ -200,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"); @@ -328,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) @@ -340,7 +346,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format * if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK) return NOTOK; if (ct->c_showproc && !strcmp (ct->c_showproc, "true")) - return (alternate ? DONE : OK); + return OK; if (! strcmp(invo_name, "mhshow") && ct->c_type == CT_TEXT && ct->c_subtype == TEXT_PLAIN) { @@ -354,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); } @@ -369,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; } @@ -388,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) { @@ -419,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; } @@ -445,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); @@ -458,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"); @@ -483,14 +488,18 @@ 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 ? DONE : status); + return (alternate ? OK : status); } } } @@ -523,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); } @@ -546,8 +555,9 @@ show_multi (CT ct, int alternate, int concatsw, int textonly, int inlineonly, if ((cp = context_find_by_type ("show", ci->ci_type, ci->ci_subtype))) return show_multi_aux (ct, alternate, cp, fmt); - if ((cp = ct->c_showproc)) + if ((cp = ct->c_showproc)) { return show_multi_aux (ct, alternate, cp, fmt); + } /* * Use default method to display this multipart content. Even @@ -572,6 +582,9 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly, struct multipart *m = (struct multipart *) ct->c_ctparams; struct part *part; int request_matched; + int display_success; + int mult_alt_done; + int ret; CT p; alternating = 0; @@ -583,41 +596,57 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly, } /* - * alternate -> we are a part inside an multipart/alternative + * alternate -> we are a part inside a multipart/alternative * alternating -> we are a multipart/alternative */ - result = alternate ? NOTOK : OK; + result = NOTOK; request_matched = 0; + display_success = 0; + mult_alt_done = 0; for (part = m->mp_parts; part; part = part->mp_next) { p = part->mp_part; - if (part_ok (p, 1) && type_ok (p, 1)) { - int inneresult; + /* while looking for the right displayable alternative, we + * use a looser search criterion than we do after finding it. + * specifically, while still looking, part_ok() will match + * "parent" parts (e.g. "-part 2" where 2 is a high-level + * multipart). after finding it, we use part_exact() to only + * choose a part that was requested explicitly. + */ + if ((part_exact(p) && type_ok(p, 1)) || + (!mult_alt_done && part_ok (p) && type_ok (p, 1))) { - request_matched = 1; + int inneresult; inneresult = show_switch (p, nowalternate, concatsw, textonly, inlineonly, fmt); switch (inneresult) { - case NOTOK: + case NOTOK: /* hard display error */ + request_matched = 1; if (alternate && !alternating) { result = NOTOK; goto out; } continue; - case OK: - case DONE: + case DONE: /* found no match on content type */ + continue; + + case OK: /* display successful */ + request_matched = 1; + display_success = 1; + result = OK; + + /* if we got success on a sub-part of + * multipart/alternative, we're done, unless + * there's a chance an explicit part should be + * matched later in the alternatives. */ if (alternating) { - result = DONE; - break; - } - if (alternate) { + mult_alt_done = 1; + } else if (alternate) { alternate = nowalternate = 0; - if (result == NOTOK) - result = inneresult; } continue; } @@ -625,17 +654,23 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly, } } - if (alternating && !part && request_matched) { + /* we're supposed to be displaying at least something from a + * multipart/alternative. if we've had parts to consider, and + * we've had no success, then we should complain. we shouldn't + * complain if none of the parts matched any -part or -type option. + */ + if (alternating && request_matched && !display_success) { + /* if we're ourselves an alternate. don't complain yet. */ if (!alternate) content_error (NULL, ct, "don't know how to display any of the contents"); result = NOTOK; - goto out; } out: /* if no parts matched what was requested, there can't have been - * any display errors, so we report OK. */ - return request_matched ? result : OK; + * any display errors. we report DONE rather than OK. */ + ret = request_matched ? result : DONE; + return ret; } @@ -668,17 +703,17 @@ 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 (alternate ? DONE : OK); + return OK; (*p->c_ceclosefnx) (p); } } 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; } @@ -705,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); } @@ -802,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) { @@ -856,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 */ @@ -901,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; @@ -951,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. */ @@ -1039,10 +1073,11 @@ 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) { - 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; } @@ -1051,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; @@ -1108,13 +1143,38 @@ 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; + /* inform("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 --; + /* inform("convert_charset: EILSEQ"); */ + goto iconv_start; + } + 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"); } } @@ -1149,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); @@ -1177,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; @@ -1197,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); @@ -1223,6 +1285,7 @@ convert_content_charset (CT ct, char **file) { * Compile our format string and save any parameters we care about. */ +#define DEFAULT_HEADER "[ Message %{folder}%<{folder}:%>%(msg) ]" #define DEFAULT_MARKER "[ part %{part} - %{content-type} - " \ "%<{description}%{description}" \ "%?{cdispo-filename}%{cdispo-filename}" \ @@ -1230,7 +1293,29 @@ convert_content_charset (CT ct, char **file) { "%(kilo(size))B %<(unseen)\\(suppressed\\)%> ]" static struct format * -compile_marker(char *markerform) +compile_header(char *form) +{ + struct format *fmt; + char *fmtstring; + struct comp *comp = NULL; + unsigned int bucket; + + fmtstring = new_fs(form, NULL, DEFAULT_HEADER); + + (void) fmt_compile(fmtstring, &fmt, 1); + free_fs(); + + while ((comp = fmt_nextcomp(comp, &bucket)) != NULL) { + if (strcasecmp(comp->c_name, "folder") == 0) { + folder_comp = comp; + } + } + + return fmt; +} + +static struct format * +compile_marker(char *form) { struct format *fmt; char *fmtstring; @@ -1238,10 +1323,10 @@ compile_marker(char *markerform) unsigned int bucket; struct param_comp_list *pc_entry; - fmtstring = new_fs(markerform, NULL, DEFAULT_MARKER); + fmtstring = new_fs(form, NULL, DEFAULT_MARKER); (void) fmt_compile(fmtstring, &fmt, 1); - free(fmtstring); + free_fs(); /* * Things we care about: @@ -1265,15 +1350,15 @@ compile_marker(char *markerform) 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; @@ -1287,13 +1372,46 @@ compile_marker(char *markerform) * Output on stdout an appropriate marker for this content, using mh-format */ +static void +output_header(CT ct, struct format *fmt) +{ + charstring_t outbuf = charstring_create (BUFSIZ); + int dat[5] = { 0 }; + char *endp; + int message = 0; + + if (folder_comp) + folder_comp->c_text = getcpy(folder); + + if (ct->c_file && *ct->c_file) { + message = strtol(ct->c_file, &endp, 10); + if (*endp) message = 0; + dat[0] = message; + } + + /* it would be nice to populate dat[2], for %(size) here, + * but it's not available. it might also be nice to know + * if the message originally had any mime parts or not -- but + * there's also no record of that. (except for MIME-version:) + */ + + fmt_scan(fmt, outbuf, BUFSIZ, dat, NULL); + + fputs(charstring_buffer (outbuf), stdout); + charstring_free (outbuf); + + fmt_freecomptext(); +} + static void output_marker(CT ct, struct format *fmt, int hidden) { charstring_t outbuf = charstring_create (BUFSIZ); struct param_comp_list *pcentry; int partsize; - int dat[5]; + int message = 0; + char *endp; + int dat[5] = { 0 }; /* * Grab any items we care about. @@ -1305,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) { @@ -1331,13 +1449,18 @@ output_marker(CT ct, struct format *fmt, int hidden) else partsize = ct->c_end - ct->c_begin; + if (ct->c_file && *ct->c_file) { + message = strtol(ct->c_file, &endp, 10); + if (*endp) message = 0; + dat[0] = message; + } + dat[2] = partsize; + /* make the part's hidden aspect available by overloading the * %(unseen) function. make the part's size available via %(size). * see comments in h/fmt_scan.h. */ - dat[2] = partsize; dat[4] = hidden; - dat[0] = dat[1] = dat[3] = 0; fmt_scan(fmt, outbuf, BUFSIZ, dat, NULL); @@ -1356,6 +1479,7 @@ free_markercomps(void) { struct param_comp_list *pc_entry, *pc2; + folder_comp = NULL; part_comp = NULL; ctype_comp = NULL; description_comp = NULL;