X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshow.c;h=e39bf65af13cbd687aff826d2e9e624124982bf4;hp=ac6b0c3e59c9fc6534b1942c1e4b67836206e20c;hb=31750e8a12eafcd1b8fa81cb12b988e680254f24;hpb=31dc797eb5178970d68962ca8939da3fd9a8efda diff --git a/uip/mhshow.c b/uip/mhshow.c index ac6b0c3..e39bf65 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -14,14 +14,17 @@ #include #include #include -#include #include +#include +#include +#include +#include static struct swit switches[] = { #define VERBSW 0 { "verbose", 0 }, #define NVERBSW 1 - { "noverbose", 0 }, + { "noverbose", 2 }, #define FILESW 2 /* interface from show */ { "file file", 0 }, #define FORMSW 3 @@ -30,15 +33,11 @@ static struct swit switches[] = { { "part number", 0 }, #define TYPESW 5 { "type content", 0 }, -#define RCACHESW 6 - { "rcache policy", 0 }, -#define WCACHESW 7 - { "wcache policy", 0 }, -#define VERSIONSW 8 - { "version", 0 }, -#define HELPSW 9 +#define VERSIONSW 6 + { "Version", 0 }, +#define HELPSW 7 { "help", 0 }, -#define DEBUGSW 10 +#define DEBUGSW 8 { "debug", -5 }, { NULL, 0 } }; @@ -47,12 +46,6 @@ 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 nolist; extern char *formsw; @@ -64,6 +57,8 @@ 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; @@ -84,18 +79,20 @@ void show_all_messages(CT *); /* mhfree.c */ void free_content(CT); extern CT *cts; -void freects_done(int) NORETURN; +void freects_done(); /* ** static prototypes */ 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; @@ -103,13 +100,19 @@ 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 = 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(); @@ -125,70 +128,54 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + 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); + snprintf(buf, sizeof(buf), "%s [+folder] %s[switches]", invo_name, mode==SHOW ? "[msgs] " : ""); print_help(buf, switches, 1); - done(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; + exit(argc == 2 ? EX_OK : EX_USAGE); case PARTSW: if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", + 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", + 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", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); - file = *cp == '-' ? cp : getcpy(expanddir(cp)); + file = *cp == '-' ? cp : mh_xstrdup(expanddir(cp)); continue; case FORMSW: if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); if (formsw) - free(formsw); - formsw = getcpy(etcpath(cp)); + mh_free0(&formsw); + formsw = mh_xstrdup(etcpath(cp)); continue; case VERBSW: @@ -204,11 +191,14 @@ 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 = getcpy(expandfol(cp)); - } else + folder = mh_xstrdup(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 */ @@ -242,15 +232,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 @@ -259,17 +240,16 @@ do_cache: if ((cp = context_find(nmhstorage)) && *cp) tmp = concat(cp, "/", invo_name, NULL); else - tmp = getcpy(toabsdir(invo_name)); + tmp = mh_xstrdup(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 */ if (file) { - if (!(cts = (CT *) calloc((size_t) 2, sizeof(*cts)))) - adios(NULL, "out of memory"); + cts = mh_xcalloc(2, sizeof(*cts)); ctp = cts; if ((ct = parse_mime(file))) @@ -278,27 +258,38 @@ do_cache: /* ** message(s) are coming from a folder */ - if (!msgs.size) - app_msgarg(&msgs, seq_cur); + 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 = getcurfol(); maildir = toabsdir(folder); if (chdir(maildir) == NOTOK) - adios(maildir, "unable to change directory to"); + 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); + 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); + exit(EX_USAGE); /* ** Set the SELECT_UNSEEN bit for all the SELECTED messages, @@ -312,9 +303,7 @@ do_cache: 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 = mh_xcalloc(mp->numsel + 1, sizeof(*cts)); ctp = cts; /* @@ -332,7 +321,7 @@ do_cache: } if (!*cts) - done(1); + exit(EX_SOFTWARE); userrs = 1; SIGNAL(SIGQUIT, quitser); @@ -353,17 +342,24 @@ 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); - free((char *) cts); - cts = NULL; + mh_free0(&cts); /* If reading from a folder, do some updating */ if (mp) { @@ -373,8 +369,7 @@ do_cache: context_save(); /* save the context file */ } - done(0); - return 1; + return 0; } @@ -388,6 +383,71 @@ pipeser(int i) 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; +}