X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshow.c;h=bb03939cce43e199722234c2b963e4c6909f98f6;hp=bbb7fb86455668ac19c2c4206208916ef122c14b;hb=6e7d34c614291079de750ceda1d4f5ec537beb81;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1 diff --git a/uip/mhshow.c b/uip/mhshow.c index bbb7fb8..bb03939 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -1,78 +1,43 @@ /* - * mhshow.c -- display the contents of MIME messages - * - * This code is Copyright (c) 2002, by the authors of nmh. See the - * COPYRIGHT file in the root directory of the nmh distribution for - * complete copyright information. - */ +** mhshow.c -- display the contents of MIME messages +** +** This code is Copyright (c) 2002, by the authors of nmh. See the +** COPYRIGHT file in the root directory of the nmh distribution for +** complete copyright information. +*/ #include #include #include -#include #include #include -#include #include #include #include -#include #include - -#ifdef HAVE_SYS_WAIT_H -# include -#endif +#include +#include +#include +#include static struct swit switches[] = { -#define CHECKSW 0 - { "check", 0 }, -#define NCHECKSW 1 - { "nocheck", 0 }, -#define PAUSESW 2 - { "pause", 0 }, -#define NPAUSESW 3 - { "nopause", 0 }, -#define SERIALSW 4 - { "serialonly", 0 }, -#define NSERIALSW 5 - { "noserialonly", 0 }, -#define VERBSW 6 +#define VERBSW 0 { "verbose", 0 }, -#define NVERBSW 7 - { "noverbose", 0 }, -#define FILESW 8 /* interface from show */ +#define NVERBSW 1 + { "noverbose", 2 }, +#define FILESW 2 /* interface from show */ { "file file", 0 }, -#define FORMSW 9 +#define FORMSW 3 { "form formfile", 0 }, -#define PARTSW 10 +#define PARTSW 4 { "part number", 0 }, -#define TYPESW 11 +#define TYPESW 5 { "type content", 0 }, -#define RCACHESW 12 - { "rcache policy", 0 }, -#define WCACHESW 13 - { "wcache policy", 0 }, -#define VERSIONSW 14 - { "version", 0 }, -#define HELPSW 15 +#define VERSIONSW 6 + { "Version", 0 }, +#define HELPSW 7 { "help", 0 }, - -/* - * switches for moreproc/mhlproc - */ -#define PROGSW 16 - { "moreproc program", -4 }, -#define NPROGSW 17 - { "nomoreproc", -3 }, -#define LENSW 18 - { "length lines", -4 }, -#define WIDTHSW 19 - { "width columns", -4 }, - -/* - * switches for debugging - */ -#define DEBUGSW 20 +#define DEBUGSW 8 { "debug", -5 }, { NULL, 0 } }; @@ -81,18 +46,8 @@ static struct swit switches[] = { /* mhparse.c */ extern char *tmp; /* directory to place temp files */ -/* mhcachesbr.c */ -extern int rcachesw; -extern int wcachesw; -extern char *cache_public; -extern char *cache_private; - /* mhshowsbr.c */ -extern int pausesw; -extern int serialsw; -extern char *progsw; extern int nolist; -extern int nomore; /* flags for moreproc/header display */ extern char *formsw; /* mhmisc.c */ @@ -102,38 +57,42 @@ extern char *parts[NPARTS + 1]; extern char *types[NTYPES + 1]; extern int userrs; +static enum { SHOW, NEXT, PREV } mode = SHOW; + int debugsw = 0; int verbosw = 0; #define quitser pipeser /* mhparse.c */ -CT parse_mime (char *); +CT parse_mime(char *); /* mhmisc.c */ -int part_ok (CT, int); -int type_ok (CT, int); -void set_endian (void); -void flush_errors (void); +int part_ok(CT, int); +int type_ok(CT, int); +void set_endian(void); +void flush_errors(void); /* mhshowsbr.c */ -void show_all_messages (CT *); +void show_all_messages(CT *); /* mhfree.c */ -void free_content (CT); +void free_content(CT); extern CT *cts; -void freects_done (int) NORETURN; +void freects_done(); /* - * static prototypes - */ -static RETSIGTYPE pipeser (int); +** static prototypes +*/ +static void pipeser(int); +static void m_popen(char *); +static void m_pclose(void); int -main (int argc, char **argv) +main(int argc, char **argv) { - int msgnum, *icachesw; + int msgnum; char *cp, *file = NULL, *folder = NULL; char *maildir, buf[100], **argp; char **arguments; @@ -141,128 +100,82 @@ main (int argc, char **argv) struct msgs *mp = NULL; CT ct, *ctp; FILE *fp; + int ontty = 0; - done=freects_done; + if (atexit(freects_done) != 0) { + adios(EX_OSERR, NULL, "atexit failed"); + } -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); + invo_name = mhbasename(argv[0]); + if (mh_strcasecmp(invo_name, "next")==0) { + mode = NEXT; + } else if (mh_strcasecmp(invo_name, "prev")==0) { + mode = PREV; + } /* read user profile/context */ context_read(); - arguments = getarguments (invo_name, argc, argv, 1); + arguments = getarguments(invo_name, argc, argv, 1); argp = arguments; /* - * Parse arguments - */ + ** Parse arguments + */ while ((cp = *argp++)) { if (*cp == '-') { - switch (smatch (++cp, switches)) { + switch (smatch(++cp, switches)) { case AMBIGSW: - ambigsw (cp, switches); - done (1); + ambigsw(cp, switches); + exit(EX_USAGE); case UNKWNSW: - adios (NULL, "-%s unknown", cp); + adios(EX_USAGE, NULL, "-%s unknown", cp); case HELPSW: - snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]", - invo_name); - print_help (buf, switches, 1); - done (1); + snprintf(buf, sizeof(buf), "%s [+folder] %s[switches]", invo_name, mode==SHOW ? "[msgs] " : ""); + print_help(buf, switches, 1); + exit(argc == 2 ? EX_OK : EX_USAGE); case VERSIONSW: print_version(invo_name); - done (1); - - case RCACHESW: - icachesw = &rcachesw; - goto do_cache; - case WCACHESW: - icachesw = &wcachesw; -do_cache: - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - switch (*icachesw = smatch (cp, caches)) { - case AMBIGSW: - ambigsw (cp, caches); - done (1); - case UNKWNSW: - adios (NULL, "%s unknown", cp); - default: - break; - } - continue; - - case CHECKSW: - checksw++; - continue; - case NCHECKSW: - checksw = 0; - continue; - - case PAUSESW: - pausesw = 1; - continue; - case NPAUSESW: - pausesw = 0; - continue; - - case SERIALSW: - serialsw = 1; - continue; - case NSERIALSW: - serialsw = 0; - continue; + exit(argc == 2 ? EX_OK : EX_USAGE); case PARTSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + adios(EX_USAGE, NULL, "missing argument to %s", + argp[-2]); if (npart >= NPARTS) - adios (NULL, "too many parts (starting with %s), %d max", - cp, NPARTS); + adios(EX_USAGE, NULL, "too many parts (starting with %s), %d max", cp, NPARTS); parts[npart++] = cp; continue; case TYPESW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + adios(EX_USAGE, NULL, "missing argument to %s", + argp[-2]); if (ntype >= NTYPES) - adios (NULL, "too many types (starting with %s), %d max", - cp, NTYPES); + adios(EX_USAGE, NULL, "too many types (starting with %s), %d max", cp, NTYPES); types[ntype++] = cp; continue; case FILESW: + if (mode != SHOW) { + adios(EX_USAGE, NULL, "Either call show as `%s' or use -file", invo_name); + } + if (!(cp = *argp++) || (*cp == '-' && cp[1])) - adios (NULL, "missing argument to %s", argp[-2]); - file = *cp == '-' ? cp : path (cp, TFILE); + adios(EX_USAGE, NULL, "missing argument to %s", + argp[-2]); + file = *cp == '-' ? cp : getcpy(expanddir(cp)); continue; case FORMSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + adios(EX_USAGE, NULL, "missing argument to %s", + argp[-2]); if (formsw) - free (formsw); - formsw = getcpy (etcpath (cp)); - continue; - - /* - * Switches for moreproc/mhlproc - */ - case PROGSW: - if (!(progsw = *argp++) || *progsw == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - case NPROGSW: - nomore++; - continue; - - case LENSW: - case WIDTHSW: - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + free(formsw); + formsw = getcpy(etcpath(cp)); continue; case VERBSW: @@ -278,192 +191,265 @@ do_cache: } if (*cp == '+' || *cp == '@') { if (folder) - adios (NULL, "only one folder at a time!"); + adios(EX_USAGE, NULL, "only one folder at a time!"); else - folder = pluspath (cp); - } else - app_msgarg(&msgs, cp); + folder = getcpy(expandfol(cp)); + } else if (mode != SHOW) { + adios(EX_USAGE, NULL, "Either call show as `%s' or give message arguments", invo_name); + } else { + app_msgarg(&msgs, cp); + } } /* null terminate the list of acceptable parts/types */ parts[npart] = NULL; types[ntype] = NULL; - set_endian (); + set_endian(); - if ((cp = getenv ("MM_NOASK")) && !strcmp (cp, "1")) { + if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0) { nolist = 1; - pausesw = 0; } /* - * Check if we've specified an additional profile - */ - if ((cp = getenv ("MHSHOW"))) { - if ((fp = fopen (cp, "r"))) { - readconfig ((struct node **) 0, fp, cp, 0); - fclose (fp); + ** Check if we've specified an additional profile + */ + if ((cp = getenv("MHSHOW"))) { + if ((fp = fopen(cp, "r"))) { + readconfig((struct node **) 0, fp, cp, 0); + fclose(fp); } else { - admonish ("", "unable to read $MHSHOW profile (%s)", cp); + admonish("", "unable to read $MHSHOW profile (%s)", + cp); } } /* - * Read the standard profile setup - */ - if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) { - readconfig ((struct node **) 0, fp, cp, 0); - fclose (fp); + ** Read the standard profile setup + */ + if ((fp = fopen(cp = etcpath("mhn.defaults"), "r"))) { + readconfig((struct node **) 0, fp, cp, 0); + fclose(fp); } - /* Check for public cache location */ - if ((cache_public = context_find (nmhcache)) && *cache_public != '/') - cache_public = NULL; - - /* Check for private cache location */ - if (!(cache_private = context_find (nmhprivcache))) - cache_private = ".cache"; - cache_private = getcpy (m_maildir (cache_private)); - /* - * Check for storage directory. If specified, - * then store temporary files there. Else we - * store them in standard nmh directory. - */ - if ((cp = context_find (nmhstorage)) && *cp) - tmp = concat (cp, "/", invo_name, NULL); + ** Check for storage directory. If specified, + ** then store temporary files there. Else we + ** store them in standard nmh directory. + */ + if ((cp = context_find(nmhstorage)) && *cp) + tmp = concat(cp, "/", invo_name, NULL); else - tmp = add (m_maildir (invo_name), NULL); - - if (!context_find ("path")) - free (path ("./", TFOLDER)); + tmp = getcpy(toabsdir(invo_name)); if (file && msgs.size) - adios (NULL, "cannot specify msg and file at same time!"); + adios(EX_USAGE, NULL, "cannot specify msg and file at same time!"); /* - * check if message is coming from file - */ + ** check if message is coming from file + */ if (file) { - if (!(cts = (CT *) calloc ((size_t) 2, sizeof(*cts)))) - adios (NULL, "out of memory"); + cts = (CT *) mh_xcalloc((size_t) 2, sizeof(*cts)); ctp = cts; - if ((ct = parse_mime (file))); + if ((ct = parse_mime(file))) *ctp++ = ct; } else { /* - * message(s) are coming from a folder - */ - if (!msgs.size) - app_msgarg(&msgs, "cur"); + ** message(s) are coming from a folder + */ + if (!msgs.size) { + switch (mode) { + case NEXT: + app_msgarg(&msgs, seq_next); + break; + case PREV: + app_msgarg(&msgs, seq_prev); + break; + default: + app_msgarg(&msgs, seq_cur); + break; + } + } if (!folder) - folder = getfolder (1); - maildir = m_maildir (folder); + folder = getcurfol(); + maildir = toabsdir(folder); - if (chdir (maildir) == NOTOK) - adios (maildir, "unable to change directory to"); + if (chdir(maildir) == NOTOK) + adios(EX_OSERR, maildir, "unable to change directory to"); /* read folder and create message structure */ - if (!(mp = folder_read (folder))) - adios (NULL, "unable to read folder %s", folder); + if (!(mp = folder_read(folder))) + adios(EX_IOERR, NULL, "unable to read folder %s", folder); /* check for empty folder */ if (mp->nummsg == 0) - adios (NULL, "no messages in %s", folder); + adios(EX_DATAERR, NULL, "no messages in %s", folder); /* parse all the message ranges/sequences and set SELECTED */ for (msgnum = 0; msgnum < msgs.size; msgnum++) - if (!m_convert (mp, msgs.msgs[msgnum])) - done (1); + if (!m_convert(mp, msgs.msgs[msgnum])) + exit(EX_USAGE); /* - * Set the SELECT_UNSEEN bit for all the SELECTED messages, - * since we will use that as a tag to know which messages - * to remove from the "unseen" sequence. - */ + ** Set the SELECT_UNSEEN bit for all the SELECTED messages, + ** since we will use that as a tag to know which messages + ** to remove from the "unseen" sequence. + */ for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) if (is_selected(mp, msgnum)) - set_unseen (mp, msgnum); + set_unseen(mp, msgnum); - seq_setprev (mp); /* set the Previous-Sequence */ - seq_setunseen (mp, 1); /* unset the Unseen-Sequence */ + seq_setprev(mp); /* set the Previous-Sequence */ + seq_setunseen(mp, 0); /* unset unseen seqs for shown msgs */ - if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts)))) - adios (NULL, "out of memory"); + cts = (CT *) mh_xcalloc((size_t) (mp->numsel + 1), + sizeof(*cts)); ctp = cts; /* - * Parse all the SELECTED messages. - */ + ** Parse all the SELECTED messages. + */ for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected(mp, msgnum)) { char *msgnam; - msgnam = m_name (msgnum); - if ((ct = parse_mime (msgnam))) + msgnam = m_name(msgnum); + if ((ct = parse_mime(msgnam))) *ctp++ = ct; } } } if (!*cts) - done (1); + exit(EX_SOFTWARE); userrs = 1; - SIGNAL (SIGQUIT, quitser); - SIGNAL (SIGPIPE, pipeser); + SIGNAL(SIGQUIT, quitser); + SIGNAL(SIGPIPE, pipeser); /* - * Get the associated umask for the relevant contents. - */ + ** Get the associated umask for the relevant contents. + */ for (ctp = cts; *ctp; ctp++) { struct stat st; ct = *ctp; - if (type_ok (ct, 1) && !ct->c_umask) { - if (stat (ct->c_file, &st) != NOTOK) + if (type_ok(ct, 1) && !ct->c_umask) { + if (stat(ct->c_file, &st) != NOTOK) ct->c_umask = ~(st.st_mode & 0777); else ct->c_umask = ~m_gmprot(); } } + if ((ontty = isatty(fileno(stdout)))) { + m_popen(defaultpager); + } + /* - * Show the message content - */ - show_all_messages (cts); + ** Show the message content + */ + show_all_messages(cts); + + if (ontty) { + m_pclose(); + } /* Now free all the structures for the content */ for (ctp = cts; *ctp; ctp++) - free_content (*ctp); + free_content(*ctp); - free ((char *) cts); + free((char *) cts); cts = NULL; /* If reading from a folder, do some updating */ if (mp) { - context_replace (pfolder, folder); /* update current folder */ - seq_setcur (mp, mp->hghsel); /* update current message */ - seq_save (mp); /* synchronize sequences */ - context_save (); /* save the context file */ + context_replace(curfolder, folder); /* update current folder */ + seq_setcur(mp, mp->hghsel); /* update current message */ + seq_save(mp); /* synchronize sequences */ + context_save(); /* save the context file */ } - done (0); - return 1; + return 0; } -static RETSIGTYPE -pipeser (int i) +static void +pipeser(int i) { if (i == SIGQUIT) { - unlink ("core"); - fflush (stdout); - fprintf (stderr, "\n"); - fflush (stderr); + unlink("core"); + fflush(stdout); + fprintf(stderr, "\n"); + fflush(stderr); } - done (1); + _exit(EX_IOERR); /* NOTREACHED */ } + + +static int m_pid = NOTOK; +static int sd = NOTOK; + + +static void +m_popen(char *name) +{ + int pd[2]; + + if ((sd = dup(fileno(stdout))) == NOTOK) + adios(EX_OSERR, "standard output", "unable to dup()"); + + if (pipe(pd) == NOTOK) + adios(EX_OSERR, "pipe", "unable to"); + + switch (m_pid = fork()) { + case NOTOK: + adios(EX_OSERR, "fork", "unable to"); + + case OK: + SIGNAL(SIGINT, SIG_DFL); + SIGNAL(SIGQUIT, SIG_DFL); + + close(pd[1]); + if (pd[0] != fileno(stdin)) { + dup2(pd[0], fileno(stdin)); + close(pd[0]); + } + execlp(name, mhbasename(name), NULL); + fprintf(stderr, "unable to exec "); + perror(name); + _exit(EX_OSERR); + + default: + close(pd[0]); + if (pd[1] != fileno(stdout)) { + dup2(pd[1], fileno(stdout)); + close(pd[1]); + } + } +} + + +void +m_pclose(void) +{ + if (m_pid == NOTOK) + return; + + if (sd != NOTOK) { + fflush(stdout); + if (dup2(sd, fileno(stdout)) == NOTOK) + adios(EX_OSERR, "standard output", "unable to dup2()"); + + clearerr(stdout); + close(sd); + sd = NOTOK; + } else + fclose(stdout); + + pidwait(m_pid, OK); + m_pid = NOTOK; +}