X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshow.c;h=c32386722c367fe75d8e62eebff3fcec40a2a3ef;hp=07a05a9bfa62047905d3907df2acb14a783d0ce5;hb=a4197ea6ffc5c1550e8b52d5a654bcaaaee04a4e;hpb=682962d94b21e120c78a52a8bdcb6aa994330a14 diff --git a/uip/mhshow.c b/uip/mhshow.c index 07a05a9..c323867 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -9,70 +9,31 @@ #include #include #include -#include #include #include -#include #include #include #include -#include #include -#ifdef HAVE_SYS_WAIT_H -# include -#endif - 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 +#define NVERBSW 1 { "noverbose", 0 }, -#define FILESW 8 /* interface from show */ +#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 +#define VERSIONSW 6 { "version", 0 }, -#define HELPSW 15 +#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 +42,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 */ @@ -127,13 +78,15 @@ void freects_done(int) NORETURN; /* ** static prototypes */ -static RETSIGTYPE pipeser(int); +static void pipeser(int); +static void m_popen(char *); +static void m_pclose(void); int main(int argc, char **argv) { - int msgnum, *icachesw; + int msgnum; char *cp, *file = NULL, *folder = NULL; char *maildir, buf[100], **argp; char **arguments; @@ -141,6 +94,7 @@ main(int argc, char **argv) struct msgs *mp = NULL; CT ct, *ctp; FILE *fp; + int ontty = 0; done=freects_done; @@ -175,47 +129,6 @@ main(int argc, char **argv) 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; - case PARTSW: if (!(cp = *argp++) || *cp == '-') adios(NULL, "missing argument to %s", @@ -250,25 +163,6 @@ do_cache: 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]); - continue; - case VERBSW: verbosw = 1; continue; @@ -295,9 +189,8 @@ do_cache: set_endian(); - if ((cp = getenv("MM_NOASK")) && !strcmp(cp, "1")) { + if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0) { nolist = 1; - pausesw = 0; } /* @@ -321,15 +214,6 @@ do_cache: 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(toabsdir(cache_private)); - /* ** Check for storage directory. If specified, ** then store temporary files there. Else we @@ -351,14 +235,14 @@ do_cache: adios(NULL, "out of memory"); 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"); + app_msgarg(&msgs, seq_cur); if (!folder) folder = getcurfol(); maildir = toabsdir(folder); @@ -389,7 +273,7 @@ do_cache: set_unseen(mp, msgnum); seq_setprev(mp); /* set the Previous-Sequence */ - seq_setunseen(mp, 1); /* unset the Unseen-Sequence */ + seq_setunseen(mp, 0); /* unset unseen seqs for shown msgs */ if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1), sizeof(*cts)))) @@ -432,11 +316,19 @@ do_cache: } } + if ((ontty = isatty(fileno(stdout)))) { + m_popen(defaultpager); + } + /* ** 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); @@ -457,7 +349,7 @@ do_cache: } -static RETSIGTYPE +static void pipeser(int i) { if (i == SIGQUIT) { @@ -470,3 +362,68 @@ pipeser(int i) done(1); /* 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("standard output", "unable to dup()"); + + if (pipe(pd) == NOTOK) + adios("pipe", "unable to"); + + switch (m_pid = fork()) { + case NOTOK: + adios("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(-1); + + 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("standard output", "unable to dup2()"); + + clearerr(stdout); + close(sd); + sd = NOTOK; + } else + fclose(stdout); + + pidwait(m_pid, OK); + m_pid = NOTOK; +}