#include <h/mh.h>
#include <fcntl.h>
#include <h/signals.h>
-#include <h/md5.h>
#include <errno.h>
#include <signal.h>
-#include <h/mts.h>
#include <h/tws.h>
#include <h/mime.h>
#include <h/mhparse.h>
-#include <h/mhcachesbr.h>
#include <h/utils.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#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
- { "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 }
};
/* 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 */
extern char *types[NTYPES + 1];
extern int userrs;
+static enum { SHOW, NEXT, PREV } mode = SHOW;
+
int debugsw = 0;
int verbosw = 0;
/*
** 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;
struct msgs *mp = NULL;
CT ct, *ctp;
FILE *fp;
+ int ontty = 0;
done=freects_done;
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();
adios(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);
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;
-
case PARTSW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
continue;
case FILESW:
+ if (mode != SHOW) {
+ adios(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]);
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;
adios(NULL, "only one folder at a time!");
else
folder = getcpy(expandfol(cp));
- } else
+ } else if (mode != SHOW) {
+ adios(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 */
if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0) {
nolist = 1;
- pausesw = 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(toabsdir(cache_private));
-
/*
** Check for storage directory. If specified,
** then store temporary files there. Else we
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, 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 ((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);
}
-static RETSIGTYPE
+static void
pipeser(int i)
{
if (i == SIGQUIT) {
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;
+}
projects / mmh / blobdiff