X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c97947332ca87805ea0bc8ce81027c1aa23fdf0e..5be8db81:/uip/mhshowsbr.c?ds=inline diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index f402b9c9..042ca7cb 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -42,7 +42,7 @@ void flush_errors (void); /* * prototypes */ -int show_content_aux (CT, int, char *, char *); +int show_content_aux (CT, int, char *, char *, struct format *fmt); /* * static prototypes @@ -50,20 +50,20 @@ int show_content_aux (CT, int, char *, char *); static void show_single_message (CT, char *, int, int, int, struct format *); static void DisplayMsgHeader (CT, char *, int); static int show_switch (CT, int, int, int, int, struct format *); -static int show_content (CT, int, int, int, struct format *fmt); -static int show_content_aux2 (CT, int, char *, char *, int, int, int); -static int show_text (CT, int, int); +static int show_content (CT, int, int, int, struct format *); +static int show_content_aux2 (CT, int, char *, char *, int, int, int, struct format *); +static int show_text (CT, int, int, struct format *); static int show_multi (CT, int, int, int, int, struct format *); -static int show_multi_internal (CT, int, int, int, int, struct format *fmt); -static int show_multi_aux (CT, int, char *); -static int show_message_rfc822 (CT, int); +static int show_multi_internal (CT, int, int, int, int, struct format *); +static int show_multi_aux (CT, int, char *, struct format *); +static int show_message_rfc822 (CT, int, struct format *); static int show_partial (CT, int); 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_marker(char *); -static void output_marker (CT, struct format *); +static void output_marker (CT, struct format *, int); static void free_markercomps (void); static int pidcheck(int); @@ -264,20 +264,18 @@ show_switch (CT ct, int alternate, int concatsw, int textonly, int inlineonly, case MESSAGE_RFC822: default: - return show_message_rfc822 (ct, alternate); + return show_message_rfc822 (ct, alternate, fmt); } case CT_TEXT: - return show_text (ct, alternate, concatsw); + return show_text (ct, alternate, concatsw, fmt); case CT_AUDIO: case CT_IMAGE: case CT_VIDEO: case CT_APPLICATION: - return show_content (ct, alternate, textonly, inlineonly, fmt); - default: - adios (NULL, "unknown content type %d", ct->c_type); + return show_content (ct, alternate, textonly, inlineonly, fmt); } return 0; /* NOT REACHED */ @@ -301,7 +299,7 @@ show_content (CT ct, int alternate, int textonly, int inlineonly, */ if (textonly || (inlineonly && !is_inline(ct))) { - output_marker(ct, fmt); + output_marker(ct, fmt, 1); return OK; } @@ -309,15 +307,15 @@ show_content (CT ct, int alternate, int textonly, int inlineonly, snprintf (buffer, sizeof(buffer), "%s-show-%s/%s", invo_name, ci->ci_type, ci->ci_subtype); if ((cp = context_find (buffer)) && *cp != '\0') - return show_content_aux (ct, alternate, cp, NULL); + return show_content_aux (ct, alternate, cp, NULL, fmt); /* Check for invo_name-show-type */ snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type); if ((cp = context_find (buffer)) && *cp != '\0') - return show_content_aux (ct, alternate, cp, NULL); + return show_content_aux (ct, alternate, cp, NULL, fmt); if ((cp = ct->c_showproc)) - return show_content_aux (ct, alternate, cp, NULL); + return show_content_aux (ct, alternate, cp, NULL, fmt); /* complain if we are not a part of a multipart/alternative */ if (!alternate) @@ -332,7 +330,7 @@ show_content (CT ct, int alternate, int textonly, int inlineonly, */ int -show_content_aux (CT ct, int alternate, char *cp, char *cracked) +show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format *fmt) { int fd; int xstdin = 0, xlist = 0; @@ -382,7 +380,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked) got_command: return show_content_aux2 (ct, alternate, cracked, buffer, - fd, xlist, xstdin); + fd, xlist, xstdin, fmt); } @@ -392,7 +390,7 @@ got_command: static int show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, - int fd, int xlist, int xstdin) + int fd, int xlist, int xstdin, struct format *fmt) { pid_t child_id; int i, vecp; @@ -412,10 +410,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, } if (xlist) { - if (ct->c_type == CT_MULTIPART) - list_content (ct, -1, 1, 0, 0, 0); - else - list_switch (ct, -1, 1, 0, 0, 0); + output_marker(ct, fmt, 0); } /* @@ -487,7 +482,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, */ static int -show_text (CT ct, int alternate, int concatsw) +show_text (CT ct, int alternate, int concatsw, struct format *fmt) { char *cp, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; @@ -496,12 +491,12 @@ show_text (CT ct, int alternate, int concatsw) snprintf (buffer, sizeof(buffer), "%s-show-%s/%s", invo_name, ci->ci_type, ci->ci_subtype); if ((cp = context_find (buffer)) && *cp != '\0') - return show_content_aux (ct, alternate, cp, NULL); + return show_content_aux (ct, alternate, cp, NULL, fmt); /* Check for invo_name-show-type */ snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type); if ((cp = context_find (buffer)) && *cp != '\0') - return show_content_aux (ct, alternate, cp, NULL); + return show_content_aux (ct, alternate, cp, NULL, fmt); /* * Use default method if content is text/plain, or if @@ -517,7 +512,7 @@ show_text (CT ct, int alternate, int concatsw) snprintf (buffer, sizeof(buffer), "%%l%s %%F", progsw ? progsw : moreproc && *moreproc ? moreproc : DEFAULT_PAGER); cp = (ct->c_showproc = add (buffer, NULL)); - return show_content_aux (ct, alternate, cp, NULL); + return show_content_aux (ct, alternate, cp, NULL, fmt); } return NOTOK; @@ -539,15 +534,15 @@ show_multi (CT ct, int alternate, int concatsw, int textonly, int inlineonly, snprintf (buffer, sizeof(buffer), "%s-show-%s/%s", invo_name, ci->ci_type, ci->ci_subtype); if ((cp = context_find (buffer)) && *cp != '\0') - return show_multi_aux (ct, alternate, cp); + return show_multi_aux (ct, alternate, cp, fmt); /* Check for invo_name-show-type */ snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type); if ((cp = context_find (buffer)) && *cp != '\0') - return show_multi_aux (ct, alternate, cp); + return show_multi_aux (ct, alternate, cp, fmt); if ((cp = ct->c_showproc)) - return show_multi_aux (ct, alternate, cp); + return show_multi_aux (ct, alternate, cp, fmt); /* * Use default method to display this multipart content. Even @@ -643,7 +638,7 @@ out: */ static int -show_multi_aux (CT ct, int alternate, char *cp) +show_multi_aux (CT ct, int alternate, char *cp, struct format *fmt) { /* xstdin is only used in the call to parse_display_string(): its value is ignored in the function. */ @@ -681,7 +676,7 @@ show_multi_aux (CT ct, int alternate, char *cp) return NOTOK; } - return show_content_aux2 (ct, alternate, NULL, buffer, NOTOK, xlist, 0); + return show_content_aux2 (ct, alternate, NULL, buffer, NOTOK, xlist, 0, fmt); } @@ -690,7 +685,7 @@ show_multi_aux (CT ct, int alternate, char *cp) */ static int -show_message_rfc822 (CT ct, int alternate) +show_message_rfc822 (CT ct, int alternate, struct format *fmt) { char *cp, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; @@ -699,20 +694,20 @@ show_message_rfc822 (CT ct, int alternate) snprintf (buffer, sizeof(buffer), "%s-show-%s/%s", invo_name, ci->ci_type, ci->ci_subtype); if ((cp = context_find (buffer)) && *cp != '\0') - return show_content_aux (ct, alternate, cp, NULL); + return show_content_aux (ct, alternate, cp, NULL, fmt); /* Check for invo_name-show-type */ snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type); if ((cp = context_find (buffer)) && *cp != '\0') - return show_content_aux (ct, alternate, cp, NULL); + return show_content_aux (ct, alternate, cp, NULL, fmt); if ((cp = ct->c_showproc)) - return show_content_aux (ct, alternate, cp, NULL); + return show_content_aux (ct, alternate, cp, NULL, fmt); /* default method for message/rfc822 */ if (ct->c_subtype == MESSAGE_RFC822) { cp = (ct->c_showproc = add ("%pshow -file %F", NULL)); - return show_content_aux (ct, alternate, cp, NULL); + return show_content_aux (ct, alternate, cp, NULL, fmt); } /* complain if we are not a part of a multipart/alternative */ @@ -1030,16 +1025,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) { char *src_charset = content_charset (ct); int status = OK; - /* norm_charmap() is case sensitive. */ - char *src_charset_u = upcase (src_charset); - char *dest_charset_u = upcase (dest_charset); - int different_charsets = - strcmp (norm_charmap (src_charset), norm_charmap (dest_charset)); - - free (dest_charset_u); - free (src_charset_u); - - if (different_charsets) { + if (strcasecmp (src_charset, dest_charset)) { #ifdef HAVE_ICONV iconv_t conv_desc = NULL; char *dest; @@ -1201,6 +1187,8 @@ iconv_start: static int convert_content_charset (CT ct, char **file) { + int status = OK; + #ifdef HAVE_ICONV /* Using current locale, see if the content needs to be converted. */ @@ -1210,27 +1198,33 @@ convert_content_charset (CT ct, char **file) { if (! check_charset (charset, strlen (charset))) { int unused = 0; - if (convert_charset (ct, get_charset (), &unused) == 0) { + char *charset = getcpy (get_charset ()); + + if (convert_charset (ct, charset, &unused) == 0) { *file = ct->c_cefile.ce_file; } else { - return NOTOK; + status = NOTOK; } + + free (charset); } #else /* ! HAVE_ICONV */ NMH_UNUSED (ct); NMH_UNUSED (file); #endif /* ! HAVE_ICONV */ - return OK; + return status; } /* * Compile our format string and save any parameters we care about. */ -#define DEFAULT_MARKER "[ part %{part} - %{content-type} - %<{description}" \ - "%{description}%?{cdispo-filename}%{cdispo-filename}" \ - "%|%{ctype-name}%> ]" +#define DEFAULT_MARKER "[ part %{part} - %{content-type} - " \ + "%<{description}%{description}" \ + "%?{cdispo-filename}%{cdispo-filename}" \ + "%|%{ctype-name}%> " \ + "%(units(size))B %<(unseen)\\(suppressed\\)%> ]" static struct format * compile_marker(char *markerform) @@ -1291,10 +1285,11 @@ compile_marker(char *markerform) */ static void -output_marker(CT ct, struct format *fmt) +output_marker(CT ct, struct format *fmt, int hidden) { char outbuf[BUFSIZ]; struct param_comp_list *pcentry; + int partsize; int dat[5]; /* @@ -1328,6 +1323,19 @@ output_marker(CT ct, struct format *fmt) pcentry->param, '?', 0); } + if (ct->c_cesizefnx) + partsize = (*ct->c_cesizefnx) (ct); + else + partsize = ct->c_end - ct->c_begin; + + /* 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, sizeof(outbuf), sizeof(outbuf), dat, NULL); fputs(outbuf, stdout);