X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshow.c;h=1ee5c82f5198a0f34a5276d99b23ef1195a8c519;hp=53f96f242afa792bfcf2a61801fe77ef2aa31033;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=d1fefd9f614e4dc3cda16da6c69133c1b2005269

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 53f96f2..1ee5c82 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -30,7 +30,7 @@ static struct swit switches[] = {
 #define TYPESW  5
 	{ "type content", 0 },
 #define VERSIONSW  6
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  7
 	{ "help", 0 },
 #define DEBUGSW  8
@@ -53,6 +53,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;
 
@@ -79,6 +81,8 @@ void freects_done(int) NORETURN;
 ** static prototypes
 */
 static void pipeser(int);
+static void m_popen(char *);
+static void m_pclose(void);
 
 
 int
@@ -92,6 +96,7 @@ main(int argc, char **argv)
 	struct msgs *mp = NULL;
 	CT ct, *ctp;
 	FILE *fp;
+	int ontty = 0;
 
 	done=freects_done;
 
@@ -99,6 +104,11 @@ main(int argc, char **argv)
 	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();
@@ -119,7 +129,7 @@ main(int argc, char **argv)
 				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:
@@ -145,6 +155,10 @@ main(int argc, char **argv)
 				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]);
@@ -176,8 +190,11 @@ main(int argc, char **argv)
 				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 */
@@ -238,8 +255,19 @@ main(int argc, char **argv)
 		/*
 		** 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);
@@ -313,11 +341,19 @@ main(int argc, char **argv)
 		}
 	}
 
+	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);
@@ -351,3 +387,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;
+}