X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=f79d42e6bdcccc91f7656ff6423ae89d2ce0610a;hp=68576f66806958c67fcad1f1b5a2584d843d2852;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4 diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 68576f6..f79d42e 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -51,44 +51,44 @@ static sigjmp_buf intrenv; /* termsbr.c */ -int SOprintf (char *, ...); +int SOprintf(char *, ...); /* mhparse.c */ -int pidcheck (int); +int pidcheck(int); /* mhmisc.c */ -int part_ok (CT, int); -int type_ok (CT, int); -void content_error (char *, CT, char *, ...); -void flush_errors (void); +int part_ok(CT, int); +int type_ok(CT, int); +void content_error(char *, CT, char *, ...); +void flush_errors(void); /* mhlistsbr.c */ -int list_switch (CT, int, int, int, int); -int list_content (CT, int, int, int, int); +int list_switch(CT, int, int, int, int); +int list_content(CT, int, int, int, int); /* ** prototypes */ -void show_all_messages (CT *); -int show_content_aux (CT, int, int, char *, char *); +void show_all_messages(CT *); +int show_content_aux(CT, int, 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 *, +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_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 RETSIGTYPE intrser (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 RETSIGTYPE intrser(int); /* @@ -96,7 +96,7 @@ static RETSIGTYPE intrser (int); */ void -show_all_messages (CT *cts) +show_all_messages(CT *cts) { CT ct, *ctp; @@ -105,20 +105,20 @@ show_all_messages (CT *cts) ** for showing headers of MIME messages. */ if (!formsw) - formsw = getcpy (etcpath ("mhl.headers")); + formsw = getcpy(etcpath("mhl.headers")); /* ** If form is "mhl.null", suppress display of header. */ - if (!strcmp (formsw, "mhl.null")) + if (!strcmp(formsw, "mhl.null")) formsw = NULL; 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)) + show_single_message(ct, formsw); } } @@ -128,7 +128,7 @@ show_all_messages (CT *cts) */ static void -show_single_message (CT ct, char *form) +show_single_message(CT ct, char *form) { sigset_t set, oset; @@ -142,7 +142,7 @@ show_single_message (CT ct, char *form) ** Allow user executable bit so that temporary directories created by ** the viewer (e.g., lynx) are going to be accessible */ - umask (ct->c_umask & ~(0100)); + umask(ct->c_umask & ~(0100)); /* ** If you have a format file, then display @@ -154,37 +154,37 @@ show_single_message (CT ct, char *form) xpid = 0; /* Show the body of the message */ - show_switch (ct, 1, 0); + show_switch(ct, 1, 0); if (ct->c_fp) { - fclose (ct->c_fp); + fclose(ct->c_fp); ct->c_fp = NULL; } 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) { + sigemptyset(&set); + sigaddset(&set, SIGHUP); + sigaddset(&set, SIGINT); + sigaddset(&set, SIGQUIT); + sigaddset(&set, SIGTERM); + SIGPROCMASK(SIG_BLOCK, &set, &oset); + + while (wait(&status) != NOTOK) { #ifdef HAVE_UNION_WAIT - pidcheck (status.w_status); + pidcheck(status.w_status); #else - pidcheck (status); + pidcheck(status); #endif continue; } /* reset the signal mask */ - SIGPROCMASK (SIG_SETMASK, &oset, &set); + SIGPROCMASK(SIG_SETMASK, &oset, &set); xpid = 0; - flush_errors (); + flush_errors(); } @@ -193,14 +193,14 @@ show_single_message (CT ct, char *form) */ static void -DisplayMsgHeader (CT ct, char *form) +DisplayMsgHeader(CT ct, char *form) { pid_t child_id; int i, vecp; char *vec[8]; vecp = 0; - vec[vecp++] = r1bindex (mhlproc, '/'); + vec[vecp++] = r1bindex(mhlproc, '/'); vec[vecp++] = "-form"; vec[vecp++] = form; vec[vecp++] = "-nobody"; @@ -218,21 +218,21 @@ DisplayMsgHeader (CT ct, char *form) } vec[vecp] = NULL; - fflush (stdout); + fflush(stdout); for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++) - sleep (5); + sleep(5); switch (child_id) { case NOTOK: - adios ("fork", "unable to"); + adios("fork", "unable to"); /* NOTREACHED */ case OK: - execvp (mhlproc, vec); - fprintf (stderr, "unable to exec "); - perror (mhlproc); - _exit (-1); + execvp(mhlproc, vec); + fprintf(stderr, "unable to exec "); + perror(mhlproc); + _exit(-1); /* NOTREACHED */ default: @@ -248,43 +248,46 @@ DisplayMsgHeader (CT ct, char *form) */ static int -show_switch (CT ct, int serial, int alternate) +show_switch(CT ct, int serial, int alternate) { switch (ct->c_type) { case CT_MULTIPART: - return show_multi (ct, serial, alternate); + return show_multi(ct, serial, alternate); break; case CT_MESSAGE: switch (ct->c_subtype) { case MESSAGE_PARTIAL: - return show_partial (ct, serial, alternate); + return show_partial(ct, serial, + alternate); break; case MESSAGE_EXTERNAL: - return show_external (ct, serial, alternate); + return show_external(ct, serial, + alternate); break; case MESSAGE_RFC822: default: - return show_message_rfc822 (ct, serial, alternate); + return show_message_rfc822(ct, serial, + alternate); break; } break; case CT_TEXT: - return show_text (ct, serial, alternate); + return show_text(ct, serial, alternate); break; case CT_AUDIO: case CT_IMAGE: case CT_VIDEO: case CT_APPLICATION: - return show_content (ct, serial, alternate); + return show_content(ct, serial, alternate); break; default: - adios (NULL, "unknown content type %d", ct->c_type); + adios(NULL, "unknown content type %d", ct->c_type); break; } @@ -297,28 +300,28 @@ show_switch (CT ct, int serial, int alternate) */ static int -show_content (CT ct, int serial, int alternate) +show_content(CT ct, int serial, int alternate) { char *cp, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; /* Check for mhshow-show-type/subtype */ - snprintf (buffer, sizeof(buffer), "%s-show-%s/%s", + 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); + if ((cp = context_find(buffer)) && *cp != '\0') + return show_content_aux(ct, serial, 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); + 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); if ((cp = ct->c_showproc)) - return show_content_aux (ct, serial, alternate, cp, NULL); + return show_content_aux(ct, serial, alternate, cp, NULL); /* complain if we are not a part of a multipart/alternative */ if (!alternate) - content_error (NULL, ct, "don't know how to display content"); + content_error(NULL, ct, "don't know how to display content"); return NOTOK; } @@ -329,7 +332,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 serial, int alternate, char *cp, char *cracked) { int fd, len, buflen, quoted; int xstdin, xlist, xpause, xtty; @@ -338,7 +341,7 @@ show_content_aux (CT ct, int serial, int alternate, char *cp, char *cracked) if (!ct->c_ceopenfnx) { if (!alternate) - content_error (NULL, ct, + content_error(NULL, ct, "don't know how to decode content"); return NOTOK; @@ -347,7 +350,7 @@ 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")) return (alternate ? DONE : OK); xlist = 0; @@ -356,7 +359,7 @@ show_content_aux (CT ct, int serial, int alternate, char *cp, char *cracked) xtty = 0; if (cracked) { - strncpy (buffer, cp, sizeof(buffer)); + strncpy(buffer, cp, sizeof(buffer)); goto got_command; } @@ -380,9 +383,9 @@ show_content_aux (CT ct, int serial, int alternate, char *cp, char *cracked) for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - snprintf (bp, buflen, "%s%s=\"%s\"", + snprintf(bp, buflen, "%s%s=\"%s\"", s, *ap, *ep); - len = strlen (bp); + len = strlen(bp); bp += len; buflen -= len; s = " "; @@ -395,9 +398,9 @@ show_content_aux (CT ct, int serial, int alternate, char *cp, char *cracked) if (ct->c_descr) { char *s; - s = trimcpy (ct->c_descr); - strncpy (bp, s, buflen); - free (s); + s = trimcpy(ct->c_descr); + strncpy(bp, s, buflen); + free(s); } break; @@ -414,7 +417,7 @@ show_content_aux (CT ct, int serial, int alternate, char *cp, char *cracked) case 'f': /* insert filename containing content */ - snprintf (bp, buflen, "'%s'", file); + snprintf(bp, buflen, "'%s'", file); /* ** since we've quoted the file argument, ** set things up to look past it, to avoid @@ -442,7 +445,7 @@ show_content_aux (CT ct, int serial, int alternate, char *cp, char *cracked) case 's': /* insert subtype of content */ - strncpy (bp, ci->ci_subtype, buflen); + strncpy(bp, ci->ci_subtype, buflen); break; case '%': @@ -455,7 +458,7 @@ show_content_aux (CT ct, int serial, int alternate, char *cp, char *cracked) buflen--; continue; } - len = strlen (bp); + len = strlen(bp); bp += len; buflen -= len; @@ -466,16 +469,16 @@ show_content_aux (CT ct, int serial, int alternate, char *cp, char *cracked) ** already */ if (!quoted && buflen) { - len = strlen (pp); - memmove (pp + 1, pp, len); + len = strlen(pp); + memmove(pp + 1, pp, len); *pp++ = '\''; buflen--; bp++; } /* Escape existing quotes */ - while ((pp = strchr (pp, '\'')) && buflen > 3) { - len = strlen (pp++); - memmove (pp + 3, pp, len); + while ((pp = strchr(pp, '\'')) && buflen > 3) { + len = strlen(pp++); + memmove(pp + 3, pp, len); *pp++ = '\\'; *pp++ = '\''; *pp++ = '\''; @@ -519,12 +522,12 @@ raw: if (ct->c_termproc) { char term[BUFSIZ]; - strncpy (term, buffer, sizeof(term)); - snprintf (buffer, sizeof(buffer), ct->c_termproc, term); + strncpy(term, buffer, sizeof(term)); + snprintf(buffer, sizeof(buffer), ct->c_termproc, term); } got_command: - return show_content_aux2 (ct, serial, alternate, cracked, buffer, + return show_content_aux2(ct, serial, alternate, cracked, buffer, fd, xlist, xpause, xstdin, xtty); } @@ -534,7 +537,7 @@ got_command: */ static int -show_content_aux2 (CT ct, int serial, int alternate, char *cracked, +show_content_aux2(CT ct, int serial, int alternate, char *cracked, char *buffer, int fd, int xlist, int xpause, int xstdin, int xtty) { pid_t child_id; @@ -542,23 +545,23 @@ show_content_aux2 (CT ct, int serial, int alternate, char *cracked, char *vec[4], exec[BUFSIZ + sizeof "exec "]; if (debugsw || cracked) { - fflush (stdout); + fflush(stdout); - fprintf (stderr, "%s msg %s", cracked ? "storing" : "show", + fprintf(stderr, "%s msg %s", cracked ? "storing" : "show", ct->c_file); if (ct->c_partno) - fprintf (stderr, " part %s", ct->c_partno); + fprintf(stderr, " part %s", ct->c_partno); if (cracked) - fprintf (stderr, " using command (cd %s; %s)\n", + fprintf(stderr, " using command (cd %s; %s)\n", cracked, buffer); else - fprintf (stderr, " using command %s\n", buffer); + fprintf(stderr, " using command %s\n", buffer); } if (xpid < 0 || (xtty && xpid)) { if (xpid < 0) xpid = -xpid; - pidcheck(pidwait (xpid, NOTOK)); + pidcheck(pidwait(xpid, NOTOK)); xpid = 0; } @@ -566,24 +569,24 @@ show_content_aux2 (CT ct, int serial, int alternate, char *cracked, char prompt[BUFSIZ]; if (ct->c_type == CT_MULTIPART) - list_content (ct, -1, 1, 0, 0); + list_content(ct, -1, 1, 0, 0); else - list_switch (ct, -1, 1, 0, 0); + list_switch(ct, -1, 1, 0, 0); - if (xpause && SOprintf ("Press to show content...")) - printf ("Press to show content..."); + 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); + istat = SIGNAL(SIGINT, intrser); + if ((intr = sigsetjmp(intrenv, 1)) == OK) { + fflush(stdout); prompt[0] = 0; - read (fileno (stdout), prompt, sizeof(prompt)); + read(fileno(stdout), prompt, sizeof(prompt)); } - SIGNAL (SIGINT, istat); + SIGNAL(SIGINT, istat); if (intr != OK || prompt[0] == 'n') { (*ct->c_ceclosefnx) (ct); return (alternate ? DONE : NOTOK); @@ -592,33 +595,33 @@ show_content_aux2 (CT ct, int serial, int alternate, char *cracked, } } - snprintf (exec, sizeof(exec), "exec %s", buffer); + snprintf(exec, sizeof(exec), "exec %s", buffer); vec[0] = "/bin/sh"; vec[1] = "-c"; vec[2] = exec; vec[3] = NULL; - fflush (stdout); + fflush(stdout); - for (i = 0; (child_id = vfork ()) == NOTOK && i < 5; i++) - sleep (5); + for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++) + sleep(5); switch (child_id) { case NOTOK: - advise ("fork", "unable to"); + advise("fork", "unable to"); (*ct->c_ceclosefnx) (ct); return NOTOK; case OK: if (cracked) - chdir (cracked); + chdir(cracked); if (!xstdin) - dup2 (fd, 0); - close (fd); - execvp ("/bin/sh", vec); - fprintf (stderr, "unable to exec "); - perror ("/bin/sh"); - _exit (-1); + dup2(fd, 0); + close(fd); + execvp("/bin/sh", vec); + fprintf(stderr, "unable to exec "); + perror("/bin/sh"); + _exit(-1); /* NOTREACHED */ default: @@ -627,7 +630,7 @@ show_content_aux2 (CT ct, int serial, int alternate, char *cracked, if (xtty) xpid = child_id; } else { - pidcheck (pidXwait (child_id, NULL)); + pidcheck(pidXwait(child_id, NULL)); } if (fd != NOTOK) @@ -642,31 +645,32 @@ 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 serial, int alternate) { char *cp, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; /* Check for mhshow-show-type/subtype */ - 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); + 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); /* 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); + 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); /* ** 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'", progsw ? progsw : - moreproc && *moreproc ? moreproc : "more"); - cp = (ct->c_showproc = add (buffer, NULL)); - return show_content_aux (ct, serial, alternate, cp, NULL); + snprintf(buffer, sizeof(buffer), "%%p%s '%%F'", + progsw ? progsw : moreproc && *moreproc ? + moreproc : "more"); + cp = (ct->c_showproc = add(buffer, NULL)); + return show_content_aux(ct, serial, alternate, cp, NULL); } return NOTOK; @@ -678,24 +682,24 @@ show_text (CT ct, int serial, int alternate) */ static int -show_multi (CT ct, int serial, int alternate) +show_multi(CT ct, int serial, int alternate) { char *cp, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; /* Check for mhshow-show-type/subtype */ - 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); + 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); /* 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); + 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); if ((cp = ct->c_showproc)) - return show_multi_aux (ct, serial, alternate, cp); + return show_multi_aux(ct, serial, alternate, cp); /* ** Use default method to display this multipart content @@ -703,7 +707,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, serial, alternate); return NOTOK; } @@ -715,7 +719,7 @@ 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 serial, int alternate) { int alternating, nowalternate, nowserial, result; struct multipart *m = (struct multipart *) ct->c_ctparams; @@ -743,12 +747,12 @@ show_multi_internal (CT ct, int serial, int alternate) /* 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); + sigemptyset(&set); + sigaddset(&set, SIGHUP); + sigaddset(&set, SIGINT); + sigaddset(&set, SIGQUIT); + sigaddset(&set, SIGTERM); + SIGPROCMASK(SIG_BLOCK, &set, &oset); } /* @@ -761,10 +765,10 @@ show_multi_internal (CT ct, int serial, int alternate) 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, 0) && type_ok(p, 0)) { int inneresult; - inneresult = show_switch (p, nowserial, nowalternate); + inneresult = show_switch(p, nowserial, nowalternate); switch (inneresult) { case NOTOK: if (alternate && !alternating) { @@ -792,7 +796,7 @@ show_multi_internal (CT ct, int serial, int alternate) if (alternating && !part) { if (!alternate) - content_error (NULL, ct, "don't know how to display any of the contents"); + content_error(NULL, ct, "don't know how to display any of the contents"); result = NOTOK; goto out; } @@ -811,18 +815,18 @@ show_multi_internal (CT ct, int serial, int alternate) p = part->mp_part; if (p->c_pid > OK) { - if (kill (p->c_pid, 0) == NOTOK) + if (kill(p->c_pid, 0) == NOTOK) p->c_pid = 0; else kids++; } } - while (kids > 0 && (pid = wait (&status)) != NOTOK) { + while (kids > 0 && (pid = wait(&status)) != NOTOK) { #ifdef HAVE_UNION_WAIT - pidcheck (status.w_status); + pidcheck(status.w_status); #else - pidcheck (status); + pidcheck(status); #endif for (part = m->mp_parts; part; part = part->mp_next) { @@ -842,7 +846,7 @@ show_multi_internal (CT ct, int serial, int alternate) out: if (!nowserial) { /* reset the signal mask */ - SIGPROCMASK (SIG_SETMASK, &oset, &set); + SIGPROCMASK(SIG_SETMASK, &oset, &set); } return result; @@ -855,7 +859,7 @@ out: */ static int -show_multi_aux (CT ct, int serial, int alternate, char *cp) +show_multi_aux(CT ct, int serial, int alternate, char *cp) { int len, buflen, quoted; int xlist, xpause, xtty; @@ -870,7 +874,7 @@ show_multi_aux (CT ct, int serial, int alternate, char *cp) if (!p->c_ceopenfnx) { if (!alternate) - content_error (NULL, p, "don't know how to decode content"); + content_error(NULL, p, "don't know how to decode content"); return NOTOK; } @@ -880,9 +884,9 @@ show_multi_aux (CT ct, int serial, int alternate, char *cp) return NOTOK; /* I'm not sure if this is necessary? */ - p->c_storage = add (file, NULL); + p->c_storage = add(file, NULL); - if (p->c_showproc && !strcmp (p->c_showproc, "true")) + if (p->c_showproc && !strcmp(p->c_showproc, "true")) return (alternate ? DONE : OK); (*p->c_ceclosefnx) (p); } @@ -911,9 +915,9 @@ show_multi_aux (CT ct, int serial, int alternate, char *cp) for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - snprintf (bp, buflen, "%s%s=\"%s\"", + snprintf(bp, buflen, "%s%s=\"%s\"", s, *ap, *ep); - len = strlen (bp); + len = strlen(bp); bp += len; buflen -= len; s = " "; @@ -926,9 +930,9 @@ show_multi_aux (CT ct, int serial, int alternate, char *cp) if (ct->c_descr) { char *s; - s = trimcpy (ct->c_descr); - strncpy (bp, s, buflen); - free (s); + s = trimcpy(ct->c_descr); + strncpy(bp, s, buflen); + free(s); } break; @@ -951,8 +955,9 @@ show_multi_aux (CT ct, int serial, int alternate, char *cp) part = part->mp_next) { p = part->mp_part; - snprintf (bp, buflen, "%s'%s'", s, p->c_storage); - len = strlen (bp); + snprintf(bp, buflen, "%s'%s'", + s, p->c_storage); + len = strlen(bp); bp += len; buflen -= len; s = " "; @@ -980,7 +985,7 @@ show_multi_aux (CT ct, int serial, int alternate, char *cp) case 's': /* insert subtype of content */ - strncpy (bp, ci->ci_subtype, buflen); + strncpy(bp, ci->ci_subtype, buflen); break; case '%': @@ -993,7 +998,7 @@ show_multi_aux (CT ct, int serial, int alternate, char *cp) buflen--; continue; } - len = strlen (bp); + len = strlen(bp); bp += len; buflen -= len; @@ -1004,16 +1009,16 @@ show_multi_aux (CT ct, int serial, int alternate, char *cp) ** already */ if (!quoted && buflen) { - len = strlen (pp); - memmove (pp + 1, pp, len); + len = strlen(pp); + memmove(pp + 1, pp, len); *pp++ = '\''; buflen--; bp++; } /* Escape existing quotes */ - while ((pp = strchr (pp, '\'')) && buflen > 3) { - len = strlen (pp++); - memmove (pp + 3, pp, len); + while ((pp = strchr(pp, '\'')) && buflen > 3) { + len = strlen(pp++); + memmove(pp + 3, pp, len); *pp++ = '\\'; *pp++ = '\''; *pp++ = '\''; @@ -1043,7 +1048,8 @@ raw: } } - if (buflen <= 0 || (ct->c_termproc && buflen <= strlen(ct->c_termproc))) { + 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 @@ -1057,11 +1063,11 @@ raw: if (ct->c_termproc) { char term[BUFSIZ]; - strncpy (term, buffer, sizeof(term)); - snprintf (buffer, sizeof(buffer), ct->c_termproc, term); + strncpy(term, buffer, sizeof(term)); + snprintf(buffer, sizeof(buffer), ct->c_termproc, term); } - return show_content_aux2 (ct, serial, alternate, NULL, buffer, + return show_content_aux2(ct, serial, alternate, NULL, buffer, NOTOK, xlist, xpause, 0, xtty); } @@ -1071,34 +1077,34 @@ raw: */ static int -show_message_rfc822 (CT ct, int serial, int alternate) +show_message_rfc822(CT ct, int serial, int alternate) { char *cp, buffer[BUFSIZ]; CI ci = &ct->c_ctinfo; /* Check for mhshow-show-type/subtype */ - snprintf (buffer, sizeof(buffer), "%s-show-%s/%s", + 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); + if ((cp = context_find(buffer)) && *cp != '\0') + return show_content_aux(ct, serial, 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); + 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); if ((cp = ct->c_showproc)) - return show_content_aux (ct, serial, alternate, cp, NULL); + return show_content_aux(ct, serial, alternate, cp, NULL); /* 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, serial, alternate, cp, NULL); + cp = (ct->c_showproc = add("%pshow -file '%F'", NULL)); + return show_content_aux(ct, serial, alternate, cp, NULL); } /* complain if we are not a part of a multipart/alternative */ if (!alternate) - content_error (NULL, ct, "don't know how to display content"); + content_error(NULL, ct, "don't know how to display content"); return NOTOK; } @@ -1109,9 +1115,9 @@ show_message_rfc822 (CT ct, int serial, int alternate) */ static int -show_partial (CT ct, int serial, int alternate) +show_partial(CT ct, int serial, int alternate) { - content_error (NULL, ct, + content_error(NULL, ct, "in order to display this message, you must reassemble it"); return NOTOK; } @@ -1124,30 +1130,30 @@ show_partial (CT ct, int serial, int alternate) */ static int -show_external (CT ct, int serial, int alternate) +show_external(CT ct, int serial, int alternate) { struct exbody *e = (struct exbody *) ct->c_ctparams; CT p = e->eb_content; - if (!type_ok (p, 0)) + if (!type_ok(p, 0)) return OK; - return show_switch (p, serial, alternate); + return show_switch(p, serial, alternate); #if 0 - content_error (NULL, p, "don't know how to display content"); + content_error(NULL, p, "don't know how to display content"); return NOTOK; #endif } static RETSIGTYPE -intrser (int i) +intrser(int i) { #ifndef RELIABLE_SIGNALS - SIGNAL (SIGINT, intrser); + SIGNAL(SIGINT, intrser); #endif - putchar ('\n'); - siglongjmp (intrenv, DONE); + putchar('\n'); + siglongjmp(intrenv, DONE); }