X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9e4dbc2d5379b96a8d90e28cf8fce803d6cc1ff4..ef0725fd97369e801a56febfdb7a6ec2eaff73c8:/uip/mhshowsbr.c diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 99bb4067..9cd67331 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -5,27 +5,33 @@ * complete copyright information. */ -#include +#include "h/mh.h" +#include "sbr/fmt_new.h" +#include "sbr/concat.h" +#include "sbr/trimcpy.h" +#include "sbr/check_charset.h" +#include "sbr/getcpy.h" +#include "sbr/context_find.h" +#include "sbr/pidstatus.h" +#include "sbr/arglist.h" +#include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "h/signals.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/fmt_scan.h" +#include "h/done.h" +#include "h/utils.h" +#include "mhmisc.h" #include "mhshowsbr.h" -#include "../sbr/m_mktemp.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; char *progsw = NULL; @@ -33,20 +39,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 */ @@ -101,20 +100,13 @@ void show_all_messages(CT *cts, int concat, int textonly, int inlineonly) { CT ct, *ctp; - struct format *hfmt, *mfmt; /* * If form is not specified, then get default form * for showing headers of MIME messages. */ if (!formsw) - formsw = getcpy (etcpath ("mhl.headers")); - - /* - * Compile the content marker and header format lines - */ - mfmt = compile_marker(markerform); - hfmt = compile_header(headerform); + formsw = mh_xstrdup(etcpath("mhl.headers")); /* * If form is "mhl.null", suppress display of header. @@ -127,16 +119,30 @@ show_all_messages(CT *cts, int concat, int textonly, int inlineonly) /* if top-level type is ok, then display message */ if (type_ok (ct, 1)) { - if (headersw) output_header(ct, hfmt); + /* + * Compile the content marker format line + */ + struct format *mfmt = compile_marker(markerform); + + if (headersw) { + /* + * Compile the header format line + */ + struct format *hfmt = compile_header(headerform); + output_header(ct, hfmt); + fmt_free(hfmt, 0); + } show_single_message (ct, formsw, concat, textonly, inlineonly, mfmt); + fmt_free(mfmt, 0); } } + /* Reset the format component hashtable, which free's any components which + it references. */ + fmt_free(NULL, 1); free_markercomps(); - fmt_free(hfmt, 1); - fmt_free(mfmt, 1); } @@ -201,7 +207,7 @@ static void DisplayMsgHeader (CT ct, char *form, int concatsw) { pid_t child_id; - int i, vecp; + int vecp; char **vec; char *file; @@ -225,9 +231,7 @@ DisplayMsgHeader (CT ct, char *form, int concatsw) 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"); @@ -237,7 +241,7 @@ DisplayMsgHeader (CT ct, char *form, int concatsw) execvp (file, vec); fprintf (stderr, "unable to exec "); perror (mhlproc); - _exit (-1); + _exit(1); /* NOTREACHED */ default: @@ -404,7 +408,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) { @@ -441,7 +445,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, } while ((cc = read(fd, readbuf, sizeof(readbuf))) > 0) { - if ((ssize_t) fwrite(readbuf, sizeof(char), cc, stdout) < cc) { + if ((ssize_t) fwrite(readbuf, 1, cc, stdout) < cc) { advise ("putline", "fwrite"); } lastchar = readbuf[cc - 1]; @@ -470,12 +474,10 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, } vec = argsplit(buffer, &file, &vecp); - 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: advise ("fork", "unable to"); @@ -494,7 +496,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, execvp (file, vec); fprintf (stderr, "unable to exec "); perror (buffer); - _exit (-1); + _exit(1); /* NOTREACHED */ default: { @@ -510,7 +512,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, arglist_free(file, vec); if (fd != NOTOK) (*ct->c_ceclosefnx) (ct); - return (alternate ? OK : status); + return alternate ? OK : status; } } } @@ -592,9 +594,9 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly, int alternating, nowalternate, result; struct multipart *m = (struct multipart *) ct->c_ctparams; struct part *part; - int request_matched; - int display_success; - int mult_alt_done; + bool request_matched; + bool display_success; + bool mult_alt_done; int ret; CT p; @@ -612,9 +614,9 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly, */ result = NOTOK; - request_matched = 0; - display_success = 0; - mult_alt_done = 0; + request_matched = false; + display_success = false; + mult_alt_done = false; for (part = m->mp_parts; part; part = part->mp_next) { p = part->mp_part; @@ -635,7 +637,7 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly, inlineonly, fmt); switch (inneresult) { case NOTOK: /* hard display error */ - request_matched = 1; + request_matched = true; if (alternate && !alternating) { result = NOTOK; goto out; @@ -646,8 +648,8 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly, continue; case OK: /* display successful */ - request_matched = 1; - display_success = 1; + request_matched = true; + display_success = true; result = OK; /* if we got success on a sub-part of @@ -655,7 +657,7 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly, * there's a chance an explicit part should be * matched later in the alternatives. */ if (alternating) { - mult_alt_done = 1; + mult_alt_done = true; } else if (alternate) { alternate = nowalternate = 0; } @@ -801,8 +803,10 @@ show_external (CT ct, int alternate, int concatsw, int textonly, int inlineonly, static int parse_display_string (CT ct, char *cp, int *xstdin, int *xlist, char *file, char *buffer, size_t buflen, - int multipart) { - int len, quoted = 0; + int multipart) +{ + int len; + bool quoted = false; char *bp = buffer, *pp; CI ci = &ct->c_ctinfo; @@ -906,7 +910,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist, case 'l': /* display listing prior to displaying content */ - *xlist = !nolist; + *xlist = 1; break; case 's': @@ -973,7 +977,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist, *pp++ = '\''; buflen--; bp++; - quoted = 1; + quoted = true; } /* Escape existing quotes */ while ((pp = strchr (pp, '\'')) && buflen > 3) { @@ -988,7 +992,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist, *pp++ = '\''; buflen -= 2; bp += 2; - quoted = 0; + quoted = false; } else { /* Not quoted. This should not be reached with the current code, but handle the condition @@ -1027,7 +1031,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist, if (! found_quote) { *bp++ = '\''; buflen--; - quoted = 0; + quoted = false; } } } @@ -1065,7 +1069,8 @@ raw: int -convert_charset (CT ct, char *dest_charset, int *message_mods) { +convert_charset (CT ct, char *dest_charset, int *message_mods) +{ char *src_charset = content_charset (ct); int status = OK; @@ -1078,7 +1083,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) { FILE **fp = NULL; size_t begin; size_t end; - int opened_input_file = 0; + bool opened_input_file = false; char src_buffer[BUFSIZ]; size_t dest_buffer_size = BUFSIZ; char *dest_buffer = mh_xmalloc(dest_buffer_size); @@ -1094,7 +1099,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) { } if ((tempfile = m_mktemp2 (NULL, invo_name, &fd, NULL)) == NULL) { - adios (NULL, "unable to create temporary file in %s", + die("unable to create temporary file in %s", get_temp_dir()); } dest = mh_xstrdup(tempfile); @@ -1116,7 +1121,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) { advise (*file, "unable to open for reading"); status = NOTOK; } else { - opened_input_file = 1; + opened_input_file = true; } } } @@ -1261,7 +1266,8 @@ iconv_start: static int -convert_content_charset (CT ct, char **file) { +convert_content_charset (CT ct, char **file) +{ int status = OK; #ifdef HAVE_ICONV @@ -1313,7 +1319,7 @@ compile_header(char *form) fmtstring = new_fs(form, NULL, DEFAULT_HEADER); - (void) fmt_compile(fmtstring, &fmt, 1); + (void) fmt_compile(fmtstring, &fmt, 0); free_fs(); while ((comp = fmt_nextcomp(comp, &bucket)) != NULL) { @@ -1336,7 +1342,7 @@ compile_marker(char *form) fmtstring = new_fs(form, NULL, DEFAULT_MARKER); - (void) fmt_compile(fmtstring, &fmt, 1); + (void) fmt_compile(fmtstring, &fmt, 0); free_fs(); /*