X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=13a65e40cdc222934fe963d669a7a46f511c49ec;hp=217e890cbd934ec05106b119f92b858d80fe2681;hb=0da86af19c369b20713d0cedf7b0b3319560f69e;hpb=ad4522348870e01f3d95eec2dd4dc008410d4cd8 diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 217e890..13a65e4 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -21,10 +20,8 @@ extern int debugsw; -int serialsw = 0; int nolist = 0; char *formsw = NULL; -pid_t xpid = 0; /* mhparse.c */ @@ -44,23 +41,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); +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); /* @@ -88,9 +85,16 @@ show_all_messages(CT *cts) for (ctp = cts; *ctp; ctp++) { ct = *ctp; - /* if top-level type is ok, then display message */ - if (type_ok(ct, 1)) - show_single_message(ct, formsw); + if (!type_ok(ct, 1)) { /* top-level type */ + continue; + } + if (cts[1]) { + if (ctp != cts) { + printf("\n\n"); + } + printf(">>> Message %s\n\n", ct->c_file); + } + show_single_message(ct, formsw); } } @@ -102,9 +106,6 @@ show_all_messages(CT *cts) static void show_single_message(CT ct, char *form) { - sigset_t set, oset; - int status; - /* ** Allow user executable bit so that temporary directories created by ** the viewer (e.g., lynx) are going to be accessible @@ -117,11 +118,9 @@ show_single_message(CT ct, char *form) */ if (form) DisplayMsgHeader(ct, form); - else - 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); @@ -130,23 +129,6 @@ show_single_message(CT ct, char *form) if (ct->c_ceclosefnx) (*ct->c_ceclosefnx) (ct); - /* block a few signals */ - sigemptyset(&set); - sigaddset(&set, SIGHUP); - sigaddset(&set, SIGINT); - sigaddset(&set, SIGQUIT); - sigaddset(&set, SIGTERM); - SIGPROCMASK(SIG_BLOCK, &set, &oset); - - while (wait(&status) != NOTOK) { - pidcheck(status); - continue; - } - - /* reset the signal mask */ - SIGPROCMASK(SIG_SETMASK, &oset, &set); - - xpid = 0; flush_errors(); } @@ -184,7 +166,7 @@ DisplayMsgHeader(CT ct, char *form) /* NOTREACHED */ default: - xpid = -child_id; + pidcheck(pidwait(child_id, NOTOK)); break; } } @@ -196,40 +178,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: @@ -246,7 +227,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; @@ -255,15 +236,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) @@ -276,12 +257,11 @@ show_content(CT ct, int serial, int alternate) /* ** Parse the display string for displaying generic content */ - 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; + int xstdin, xlist; char *bp, *pp, *file, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; @@ -301,7 +281,6 @@ show_content_aux(CT ct, int serial, int alternate, char *cp, char *cracked) xlist = 0; xstdin = 0; - xtty = 0; if (cracked) { strncpy(buffer, cp, sizeof(buffer)); @@ -338,6 +317,12 @@ show_content_aux(CT ct, int serial, int alternate, char *cp, char *cracked) } break; + case 'c': + /* insert charset */ + strncpy(bp, ct->c_charset ? ct->c_charset : + "US-ASCII", buflen); + break; + case 'd': /* insert content description */ if (ct->c_descr) { @@ -349,15 +334,9 @@ show_content_aux(CT ct, int serial, int alternate, char *cp, char *cracked) } break; - case 'e': - /* exclusive execution */ - xtty = 1; - break; - case 'F': - /* %e, %f, and stdin is terminal not content */ + /* %f, and stdin is terminal not content */ xstdin = 1; - xtty = 1; /* and fall... */ case 'f': @@ -376,7 +355,6 @@ show_content_aux(CT ct, int serial, int alternate, char *cp, char *cracked) pp = bp; break; - case 'p': case 'l': /* ** display listing prior to displaying content @@ -449,40 +427,20 @@ raw: } } - if (buflen <= 0 || (ct->c_termproc && buflen <= strlen(ct->c_termproc))) { - /* - ** content_error would provide a more useful error message - ** here, except that if we got overrun, it probably would - ** too. - */ - fprintf(stderr, "Buffer overflow constructing show command!\n"); - return NOTOK; - } - - /* use charset string to modify display method */ - if (ct->c_termproc) { - char term[BUFSIZ]; - - strncpy(term, buffer, sizeof(term)); - snprintf(buffer, sizeof(buffer), ct->c_termproc, term); - } - got_command: - return show_content_aux2(ct, serial, alternate, cracked, buffer, - fd, xlist, xstdin, xtty); + return show_content_aux2(ct, alternate, cracked, buffer, + fd, xlist, xstdin); } /* ** Routine to actually display the content */ - static int -show_content_aux2(CT ct, int serial, int alternate, char *cracked, - char *buffer, int fd, int xlist, int xstdin, int xtty) +show_content_aux2(CT ct, int alternate, char *cracked, + char *buffer, int fd, int xlist, int xstdin) { pid_t child_id; - char *vec[4], exec[BUFSIZ + sizeof "exec "]; if (debugsw || cracked) { fflush(stdout); @@ -498,13 +456,6 @@ show_content_aux2(CT ct, int serial, int alternate, char *cracked, fprintf(stderr, " using command %s\n", buffer); } - if (xpid < 0 || (xtty && xpid)) { - if (xpid < 0) - xpid = -xpid; - pidcheck(pidwait(xpid, NOTOK)); - xpid = 0; - } - if (xlist) { if (ct->c_type == CT_MULTIPART) list_content(ct, -1, 1, 0, 0); @@ -512,13 +463,6 @@ show_content_aux2(CT ct, int serial, int alternate, char *cracked, list_switch(ct, -1, 1, 0, 0); } - snprintf(exec, sizeof(exec), "exec %s", buffer); - - vec[0] = "/bin/sh"; - vec[1] = "-c"; - vec[2] = exec; - vec[3] = NULL; - fflush(stdout); switch (child_id = fork()) { @@ -533,20 +477,14 @@ show_content_aux2(CT ct, int serial, int alternate, char *cracked, if (!xstdin) dup2(fd, 0); close(fd); - execvp("/bin/sh", vec); + execlp("/bin/sh", "/bin/sh", "-c", buffer, NULL); fprintf(stderr, "unable to exec "); perror("/bin/sh"); _exit(-1); /* 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); @@ -560,7 +498,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; @@ -569,21 +507,27 @@ 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 ** if it is not a text part of a multipart/alternative */ if (!alternate || ct->c_subtype == TEXT_PLAIN) { - snprintf(buffer, sizeof(buffer), "%%p%s '%%F'", defaultpager); + if (ct->c_charset && !check_charset(ct->c_charset, + strlen(ct->c_charset))) { + snprintf(buffer, sizeof(buffer), "%%liconv -f '%s'", + ct->c_charset); + } else { + snprintf(buffer, sizeof(buffer), "%%lcat"); + } 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; @@ -595,7 +539,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; @@ -604,15 +548,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 @@ -620,7 +564,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; } @@ -632,46 +576,33 @@ 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; @@ -681,7 +612,7 @@ show_multi_internal(CT ct, int serial, int alternate) 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) { @@ -713,47 +644,7 @@ show_multi_internal(CT ct, int serial, int alternate) result = NOTOK; goto out; } - - if (serial && !nowserial) { - pid_t pid; - int kids; - int status; - - 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) { - pidcheck(status); - - 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; } @@ -764,10 +655,10 @@ 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; + int xlist; char *bp, *pp, *file, buffer[BUFSIZ]; struct multipart *m = (struct multipart *) ct->c_ctparams; struct part *part; @@ -798,7 +689,6 @@ show_multi_aux(CT ct, int serial, int alternate, char *cp) } xlist = 0; - xtty = 0; /* get buffer ready to go */ bp = buffer; @@ -829,6 +719,12 @@ show_multi_aux(CT ct, int serial, int alternate, char *cp) } break; + case 'c': + /* insert charset */ + strncpy(bp, ct->c_charset ? ct->c_charset : + "US-ASCII", buflen); + break; + case 'd': /* insert content description */ if (ct->c_descr) { @@ -840,16 +736,7 @@ show_multi_aux(CT ct, int serial, int alternate, char *cp) } break; - case 'e': - /* exclusive execution */ - xtty = 1; - break; - case 'F': - /* %e and %f */ - xtty = 1; - /* and fall... */ - case 'f': /* insert filename(s) containing content */ { @@ -875,7 +762,6 @@ show_multi_aux(CT ct, int serial, int alternate, char *cp) } break; - case 'p': case 'l': /* ** display listing prior to displaying content @@ -948,27 +834,8 @@ raw: } } - if (buflen <= 0 || - (ct->c_termproc && buflen <= strlen(ct->c_termproc))) { - /* - ** content_error would provide a more useful error message - ** here, except that if we got overrun, it probably would - ** too. - */ - fprintf(stderr, "Buffer overflow constructing show command!\n"); - return NOTOK; - } - - /* use charset string to modify display method */ - if (ct->c_termproc) { - char term[BUFSIZ]; - - strncpy(term, buffer, sizeof(term)); - snprintf(buffer, sizeof(buffer), ct->c_termproc, term); - } - - return show_content_aux2(ct, serial, alternate, NULL, buffer, - NOTOK, xlist, 0, xtty); + return show_content_aux2(ct, alternate, NULL, buffer, + NOTOK, xlist, 0); } @@ -977,7 +844,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; @@ -986,20 +853,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); + cp = (ct->c_showproc = getcpy("%lshow -file %F")); + return show_content_aux(ct, alternate, cp, NULL); } /* complain if we are not a part of a multipart/alternative */ @@ -1015,7 +882,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"); @@ -1024,24 +891,34 @@ show_partial(CT ct, int serial, int alternate) /* -** Show content of type "message/external". -** -** THE ERROR CHECKING IN THIS ONE IS NOT DONE YET. +** Show how to retrieve content of type "message/external". */ - 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; - - if (!type_ok(p, 0)) - return OK; - - return show_switch(p, serial, alternate); - -#if 0 - content_error(NULL, p, "don't know how to display content"); - return NOTOK; -#endif + char **ap, **ep; + char *msg; + FILE *fp; + char buf[BUFSIZ]; + + msg = add("You need to fetch the contents yourself:", NULL); + ap = ct->c_ctinfo.ci_attrs; + ep = ct->c_ctinfo.ci_values; + for (; *ap; ap++, ep++) { + msg = add(concat("\n\t", *ap, ": ", *ep, NULL), msg); + } + if (!(fp = fopen(ct->c_file, "r"))) { + adios(ct->c_file, "unable to open"); + } + fseek(fp, ct->c_begin, SEEK_SET); + while (!feof(fp) && ftell(fp) < ct->c_end) { + if (!fgets(buf, sizeof buf, fp)) { + adios(ct->c_file, "unable to read"); + } + *strchr(buf, '\n') = '\0'; + msg = add(concat("\n\t", buf, NULL), msg); + } + fclose(fp); + content_error(NULL, ct, msg); + return OK; }