X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=e302d3bde69cf4ac9f8759e409588bfb941d8b28;hb=33dc8211a72df0c27fa11220f3b27583cd1c7e49;hp=0136ca32d13a542e5e26e789dac383ef6c9648a5;hpb=5b792c4424571f05bc2008e3109797d18d7d00d1;p=mmh diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 0136ca3..e302d3b 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -35,7 +34,6 @@ extern int debugsw; -int pausesw = 1; int serialsw = 0; int nolist = 0; @@ -47,8 +45,6 @@ char *formsw = NULL; pid_t xpid = 0; -static sigjmp_buf intrenv; - /* termsbr.c */ int SOprintf(char *, ...); @@ -79,8 +75,7 @@ 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, 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); @@ -88,7 +83,6 @@ 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 RETSIGTYPE intrser(int); /* @@ -110,7 +104,7 @@ show_all_messages(CT *cts) /* ** If form is "mhl.null", suppress display of header. */ - if (!strcmp(formsw, "mhl.null")) + if (strcmp(formsw, "mhl.null")==0) formsw = NULL; for (ctp = cts; *ctp; ctp++) { @@ -220,7 +214,7 @@ DisplayMsgHeader(CT ct, char *form) fflush(stdout); - for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++) + for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) sleep(5); switch (child_id) { @@ -333,7 +327,7 @@ int show_content_aux(CT ct, int serial, int alternate, char *cp, char *cracked) { int fd, len, buflen, quoted; - int xstdin, xlist, xpause, xtty; + int xstdin, xlist, xtty; char *bp, *pp, *file, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; @@ -348,11 +342,10 @@ show_content_aux(CT ct, int serial, int alternate, char *cp, char *cracked) file = NULL; if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK) return NOTOK; - if (ct->c_showproc && !strcmp(ct->c_showproc, "true")) + if (ct->c_showproc && strcmp(ct->c_showproc, "true")==0) return (alternate ? DONE : OK); xlist = 0; - xpause = 0; xstdin = 0; xtty = 0; @@ -430,10 +423,6 @@ show_content_aux(CT ct, int serial, int alternate, char *cp, char *cracked) break; case 'p': - /* %l, and pause prior to displaying content */ - xpause = pausesw; - /* and fall... */ - case 'l': /* ** display listing prior to displaying content @@ -526,7 +515,7 @@ raw: got_command: return show_content_aux2(ct, serial, alternate, cracked, buffer, - fd, xlist, xpause, xstdin, xtty); + fd, xlist, xstdin, xtty); } @@ -536,7 +525,7 @@ got_command: static int show_content_aux2(CT ct, int serial, int alternate, char *cracked, - char *buffer, int fd, int xlist, int xpause, int xstdin, int xtty) + char *buffer, int fd, int xlist, int xstdin, int xtty) { pid_t child_id; int i; @@ -564,33 +553,10 @@ show_content_aux2(CT ct, int serial, int alternate, char *cracked, } if (xlist) { - char prompt[BUFSIZ]; - if (ct->c_type == CT_MULTIPART) list_content(ct, -1, 1, 0, 0); else list_switch(ct, -1, 1, 0, 0); - - if (xpause && SOprintf("Press to show content...")) - printf("Press to show content..."); - - if (xpause) { - int intr; - SIGNAL_HANDLER istat; - - istat = SIGNAL(SIGINT, intrser); - if ((intr = sigsetjmp(intrenv, 1)) == OK) { - fflush(stdout); - prompt[0] = 0; - read(fileno(stdout), prompt, sizeof(prompt)); - } - SIGNAL(SIGINT, istat); - if (intr != OK || prompt[0] == 'n') { - (*ct->c_ceclosefnx) (ct); - return (alternate ? DONE : NOTOK); - } - if (prompt[0] == 'q') done(OK); - } } snprintf(exec, sizeof(exec), "exec %s", buffer); @@ -602,7 +568,7 @@ show_content_aux2(CT ct, int serial, int alternate, char *cracked, fflush(stdout); - for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++) + for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) sleep(5); switch (child_id) { case NOTOK: @@ -860,7 +826,7 @@ static int show_multi_aux(CT ct, int serial, int alternate, char *cp) { int len, buflen, quoted; - int xlist, xpause, xtty; + int xlist, xtty; char *bp, *pp, *file, buffer[BUFSIZ]; struct multipart *m = (struct multipart *) ct->c_ctparams; struct part *part; @@ -884,14 +850,13 @@ show_multi_aux(CT ct, int serial, int alternate, char *cp) /* I'm not sure if this is necessary? */ p->c_storage = getcpy(file); - if (p->c_showproc && !strcmp(p->c_showproc, "true")) + if (p->c_showproc && strcmp(p->c_showproc, "true")==0) return (alternate ? DONE : OK); (*p->c_ceclosefnx) (p); } } xlist = 0; - xpause = 0; xtty = 0; /* get buffer ready to go */ @@ -970,10 +935,6 @@ show_multi_aux(CT ct, int serial, int alternate, char *cp) break; case 'p': - /* %l, and pause prior to displaying content */ - xpause = pausesw; - /* and fall... */ - case 'l': /* ** display listing prior to displaying content @@ -1066,7 +1027,7 @@ raw: } return show_content_aux2(ct, serial, alternate, NULL, buffer, - NOTOK, xlist, xpause, 0, xtty); + NOTOK, xlist, 0, xtty); } @@ -1143,15 +1104,3 @@ show_external(CT ct, int serial, int alternate) return NOTOK; #endif } - - -static RETSIGTYPE -intrser(int i) -{ -#ifndef RELIABLE_SIGNALS - SIGNAL(SIGINT, intrser); -#endif - - putchar('\n'); - siglongjmp(intrenv, DONE); -}