X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=75633b76e6ccd647119f916cc46c3c9f92c39192;hb=d0581ba306a7299113a346f9b4c46ce97bc4cef6;hp=6dae3e8b944eb3785d16c4ceb1eb4364a360fbd4;hpb=0c4214ea2aec6497d0d67b436bbee9bc1d225f1e;p=mmh diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 6dae3e8..75633b7 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -17,24 +17,10 @@ #include #include #include - -#ifdef HAVE_SYS_WAIT_H -# include -#endif - -/* -** Just use sigjmp/longjmp on older machines that -** don't have sigsetjmp/siglongjmp. -*/ -#ifndef HAVE_SIGSETJMP -# define sigjmp_buf jmp_buf -# define sigsetjmp(env,mask) setjmp(env) -# define siglongjmp(env,val) longjmp(env,val) -#endif +#include extern int debugsw; -int serialsw = 0; int nolist = 0; char *formsw = NULL; pid_t xpid = 0; @@ -57,23 +43,23 @@ int list_content(CT, int, int, int, int); ** prototypes */ void show_all_messages(CT *); -int show_content_aux(CT, int, int, char *, char *); +int show_content_aux(CT, int, char *, char *); /* ** static prototypes */ static void show_single_message(CT, char *); static void DisplayMsgHeader(CT, char *); -static int show_switch(CT, int, int); -static int show_content(CT, int, int); -static int show_content_aux2(CT, int, int, char *, char *, int, int, int, int); -static int show_text(CT, int, int); -static int show_multi(CT, int, int); -static int show_multi_internal(CT, int, int); -static int show_multi_aux(CT, int, int, char *); -static int show_message_rfc822(CT, int, int); -static int show_partial(CT, int, int); -static int show_external(CT, int, int); +static int show_switch(CT, int); +static int show_content(CT, int); +static int show_content_aux2(CT, int, char *, char *, int, int, int, int); +static int show_text(CT, int); +static int show_multi(CT, int); +static int show_multi_internal(CT, int); +static int show_multi_aux(CT, int, char *); +static int show_message_rfc822(CT, int); +static int show_partial(CT, int); +static int show_external(CT, int); /* @@ -116,12 +102,7 @@ static void show_single_message(CT ct, char *form) { sigset_t set, oset; - -#ifdef HAVE_UNION_WAIT - union wait status; -#else int status; -#endif /* ** Allow user executable bit so that temporary directories created by @@ -139,7 +120,7 @@ show_single_message(CT ct, char *form) xpid = 0; /* Show the body of the message */ - show_switch(ct, 1, 0); + show_switch(ct, 0); if (ct->c_fp) { fclose(ct->c_fp); @@ -154,19 +135,15 @@ show_single_message(CT ct, char *form) sigaddset(&set, SIGINT); sigaddset(&set, SIGQUIT); sigaddset(&set, SIGTERM); - SIGPROCMASK(SIG_BLOCK, &set, &oset); + sigprocmask(SIG_BLOCK, &set, &oset); while (wait(&status) != NOTOK) { -#ifdef HAVE_UNION_WAIT - pidcheck(status.w_status); -#else pidcheck(status); -#endif continue; } /* reset the signal mask */ - SIGPROCMASK(SIG_SETMASK, &oset, &set); + sigprocmask(SIG_SETMASK, &oset, &set); xpid = 0; flush_errors(); @@ -174,9 +151,8 @@ show_single_message(CT ct, char *form) /* -** Use the mhlproc to show the header fields +** Use mhl to show the header fields */ - static void DisplayMsgHeader(CT ct, char *form) { @@ -185,7 +161,7 @@ DisplayMsgHeader(CT ct, char *form) char *vec[8]; vecp = 0; - vec[vecp++] = mhbasename(mhlproc); + vec[vecp++] = "mhl"; vec[vecp++] = "-form"; vec[vecp++] = form; vec[vecp++] = "-nobody"; @@ -200,9 +176,9 @@ DisplayMsgHeader(CT ct, char *form) /* NOTREACHED */ case OK: - execvp(mhlproc, vec); + execvp("mhl", vec); fprintf(stderr, "unable to exec "); - perror(mhlproc); + perror("mhl"); _exit(-1); /* NOTREACHED */ @@ -219,40 +195,39 @@ DisplayMsgHeader(CT ct, char *form) */ static int -show_switch(CT ct, int serial, int alternate) +show_switch(CT ct, int alternate) { switch (ct->c_type) { case CT_MULTIPART: - return show_multi(ct, serial, alternate); + return show_multi(ct, alternate); break; case CT_MESSAGE: switch (ct->c_subtype) { case MESSAGE_PARTIAL: - return show_partial(ct, serial, alternate); + return show_partial(ct, alternate); break; case MESSAGE_EXTERNAL: - return show_external(ct, serial, alternate); + return show_external(ct, alternate); break; case MESSAGE_RFC822: default: - return show_message_rfc822(ct, serial, - alternate); + return show_message_rfc822(ct, alternate); break; } break; case CT_TEXT: - return show_text(ct, serial, alternate); + return show_text(ct, alternate); break; case CT_AUDIO: case CT_IMAGE: case CT_VIDEO: case CT_APPLICATION: - return show_content(ct, serial, alternate); + return show_content(ct, alternate); break; default: @@ -269,7 +244,7 @@ show_switch(CT ct, int serial, int alternate) */ static int -show_content(CT ct, int serial, int alternate) +show_content(CT ct, int alternate) { char *cp, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; @@ -278,15 +253,15 @@ show_content(CT ct, int serial, 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, serial, alternate, cp, NULL); + return show_content_aux(ct, alternate, cp, NULL); /* Check for mhshow-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, serial, alternate, cp, NULL); + return show_content_aux(ct, alternate, cp, NULL); if ((cp = ct->c_showproc)) - return show_content_aux(ct, serial, alternate, cp, NULL); + return show_content_aux(ct, alternate, cp, NULL); /* complain if we are not a part of a multipart/alternative */ if (!alternate) @@ -301,7 +276,7 @@ show_content(CT ct, int serial, int alternate) */ int -show_content_aux(CT ct, int serial, int alternate, char *cp, char *cracked) +show_content_aux(CT ct, int alternate, char *cp, char *cracked) { int fd, len, buflen, quoted; int xstdin, xlist, xtty; @@ -472,7 +447,8 @@ raw: } } - if (buflen <= 0 || (ct->c_termproc && buflen <= strlen(ct->c_termproc))) { + if (buflen <= 0 || (ct->c_termproc && + (size_t)buflen <= strlen(ct->c_termproc))) { /* ** content_error would provide a more useful error message ** here, except that if we got overrun, it probably would @@ -491,7 +467,7 @@ raw: } got_command: - return show_content_aux2(ct, serial, alternate, cracked, buffer, + return show_content_aux2(ct, alternate, cracked, buffer, fd, xlist, xstdin, xtty); } @@ -501,7 +477,7 @@ got_command: */ static int -show_content_aux2(CT ct, int serial, int alternate, char *cracked, +show_content_aux2(CT ct, int alternate, char *cracked, char *buffer, int fd, int xlist, int xstdin, int xtty) { pid_t child_id; @@ -563,13 +539,7 @@ show_content_aux2(CT ct, int serial, int alternate, char *cracked, /* NOTREACHED */ default: - if (!serial) { - ct->c_pid = child_id; - if (xtty) - xpid = child_id; - } else { - pidcheck(pidXwait(child_id, NULL)); - } + pidcheck(pidXwait(child_id, NULL)); if (fd != NOTOK) (*ct->c_ceclosefnx) (ct); @@ -583,7 +553,7 @@ show_content_aux2(CT ct, int serial, int alternate, char *cracked, */ static int -show_text(CT ct, int serial, int alternate) +show_text(CT ct, int alternate) { char *cp, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; @@ -592,12 +562,12 @@ show_text(CT ct, int serial, 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, serial, alternate, cp, NULL); + return show_content_aux(ct, alternate, cp, NULL); /* Check for mhshow-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, serial, alternate, cp, NULL); + return show_content_aux(ct, alternate, cp, NULL); /* ** Use default method if content is text/plain, or if @@ -606,7 +576,7 @@ show_text(CT ct, int serial, int alternate) if (!alternate || ct->c_subtype == TEXT_PLAIN) { snprintf(buffer, sizeof(buffer), "%%p%s '%%F'", defaultpager); cp = (ct->c_showproc = getcpy(buffer)); - return show_content_aux(ct, serial, alternate, cp, NULL); + return show_content_aux(ct, alternate, cp, NULL); } return NOTOK; @@ -618,7 +588,7 @@ show_text(CT ct, int serial, int alternate) */ static int -show_multi(CT ct, int serial, int alternate) +show_multi(CT ct, int alternate) { char *cp, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; @@ -627,15 +597,15 @@ show_multi(CT ct, int serial, 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_multi_aux(ct, serial, alternate, cp); + return show_multi_aux(ct, alternate, cp); /* Check for mhshow-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, serial, alternate, cp); + return show_multi_aux(ct, alternate, cp); if ((cp = ct->c_showproc)) - return show_multi_aux(ct, serial, alternate, cp); + return show_multi_aux(ct, alternate, cp); /* ** Use default method to display this multipart content @@ -643,7 +613,7 @@ show_multi(CT ct, int serial, int alternate) ** or if it is one of the known subtypes of multipart. */ if (!alternate || ct->c_subtype != MULTI_UNKNOWN) - return show_multi_internal(ct, serial, alternate); + return show_multi_internal(ct, alternate); return NOTOK; } @@ -655,56 +625,43 @@ show_multi(CT ct, int serial, int alternate) */ static int -show_multi_internal(CT ct, int serial, int alternate) +show_multi_internal(CT ct, int alternate) { - int alternating, nowalternate, nowserial, result; + int alternating, nowalternate, result; struct multipart *m = (struct multipart *) ct->c_ctparams; struct part *part; CT p; - sigset_t set, oset; alternating = 0; nowalternate = alternate; - if (ct->c_subtype == MULTI_PARALLEL) { - nowserial = serialsw; - } else if (ct->c_subtype == MULTI_ALTERNATE) { + if (ct->c_subtype == MULTI_ALTERNATE) { nowalternate = 1; alternating = 1; - nowserial = serial; - } else { - /* - ** multipart/mixed - ** mutlipart/digest - ** unknown subtypes of multipart (treat as mixed per rfc2046) - */ - nowserial = serial; } - /* block a few signals */ - if (!nowserial) { - sigemptyset(&set); - sigaddset(&set, SIGHUP); - sigaddset(&set, SIGINT); - sigaddset(&set, SIGQUIT); - sigaddset(&set, SIGTERM); - SIGPROCMASK(SIG_BLOCK, &set, &oset); - } + /* + ** Other possible multipart types are: + ** - multipart/parallel + ** - multipart/mixed + ** - multipart/digest + ** - unknown subtypes of multipart (treat as mixed per rfc2046) + */ -/* -** alternate -> we are a part inside an multipart/alternative -** alternating -> we are a multipart/alternative -*/ + /* + ** alternate -> we are a part inside an multipart/alternative + ** alternating -> we are a multipart/alternative + */ result = alternate ? NOTOK : OK; for (part = m->mp_parts; part; part = part->mp_next) { p = part->mp_part; - if (part_ok(p, 0) && type_ok(p, 0)) { + if (part_ok(p, 1) && type_ok(p, 1)) { int inneresult; - inneresult = show_switch(p, nowserial, nowalternate); + inneresult = show_switch(p, nowalternate); switch (inneresult) { case NOTOK: if (alternate && !alternating) { @@ -736,55 +693,7 @@ show_multi_internal(CT ct, int serial, int alternate) result = NOTOK; goto out; } - - if (serial && !nowserial) { - pid_t pid; - int kids; -#ifdef HAVE_UNION_WAIT - union wait status; -#else - int status; -#endif - - kids = 0; - for (part = m->mp_parts; part; part = part->mp_next) { - p = part->mp_part; - - if (p->c_pid > OK) { - if (kill(p->c_pid, 0) == NOTOK) - p->c_pid = 0; - else - kids++; - } - } - - while (kids > 0 && (pid = wait(&status)) != NOTOK) { -#ifdef HAVE_UNION_WAIT - pidcheck(status.w_status); -#else - pidcheck(status); -#endif - - for (part = m->mp_parts; part; part = part->mp_next) { - p = part->mp_part; - - if (xpid == pid) - xpid = 0; - if (p->c_pid == pid) { - p->c_pid = 0; - kids--; - break; - } - } - } - } - out: - if (!nowserial) { - /* reset the signal mask */ - SIGPROCMASK(SIG_SETMASK, &oset, &set); - } - return result; } @@ -795,7 +704,7 @@ out: */ static int -show_multi_aux(CT ct, int serial, int alternate, char *cp) +show_multi_aux(CT ct, int alternate, char *cp) { int len, buflen, quoted; int xlist, xtty; @@ -979,8 +888,8 @@ raw: } } - if (buflen <= 0 || - (ct->c_termproc && buflen <= strlen(ct->c_termproc))) { + if (buflen <= 0 || (ct->c_termproc && + (size_t)buflen <= strlen(ct->c_termproc))) { /* ** content_error would provide a more useful error message ** here, except that if we got overrun, it probably would @@ -998,7 +907,7 @@ raw: snprintf(buffer, sizeof(buffer), ct->c_termproc, term); } - return show_content_aux2(ct, serial, alternate, NULL, buffer, + return show_content_aux2(ct, alternate, NULL, buffer, NOTOK, xlist, 0, xtty); } @@ -1008,7 +917,7 @@ raw: */ static int -show_message_rfc822(CT ct, int serial, int alternate) +show_message_rfc822(CT ct, int alternate) { char *cp, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; @@ -1017,20 +926,20 @@ show_message_rfc822(CT ct, int serial, 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, serial, alternate, cp, NULL); + return show_content_aux(ct, alternate, cp, NULL); /* Check for mhshow-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, serial, alternate, cp, NULL); + return show_content_aux(ct, alternate, cp, NULL); if ((cp = ct->c_showproc)) - return show_content_aux(ct, serial, alternate, cp, NULL); + return show_content_aux(ct, alternate, cp, NULL); /* default method for message/rfc822 */ if (ct->c_subtype == MESSAGE_RFC822) { cp = (ct->c_showproc = getcpy("%pshow -file '%F'")); - return show_content_aux(ct, serial, alternate, cp, NULL); + return show_content_aux(ct, alternate, cp, NULL); } /* complain if we are not a part of a multipart/alternative */ @@ -1046,7 +955,7 @@ show_message_rfc822(CT ct, int serial, int alternate) */ static int -show_partial(CT ct, int serial, int alternate) +show_partial(CT ct, int alternate) { content_error(NULL, ct, "in order to display this message, you must reassemble it"); @@ -1061,7 +970,7 @@ show_partial(CT ct, int serial, int alternate) */ static int -show_external(CT ct, int serial, int alternate) +show_external(CT ct, int alternate) { struct exbody *e = (struct exbody *) ct->c_ctparams; CT p = e->eb_content; @@ -1069,7 +978,7 @@ show_external(CT ct, int serial, int alternate) if (!type_ok(p, 0)) return OK; - return show_switch(p, serial, alternate); + return show_switch(p, alternate); #if 0 content_error(NULL, p, "don't know how to display content");