From: Paul Fox <pgf@foxharp.boston.ma.us>
Date: Sat, 11 Feb 2012 17:41:30 +0000 (-0500)
Subject: mhshow: suppress pause actions if stdout isn't a tty
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=3325d1a5623f39b8f0cf8c342da88024397500f7;hp=7b45ebd870d32add1d4185159ec856f9d9684b5c;p=mmh

mhshow: suppress pause actions if stdout isn't a tty

previously, "mhshow | cat" would both print a "Press return" prompt
to, and attempt to read from, its piped output fd.
---

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index c60acb9..5abd67d 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -533,11 +533,11 @@ show_content_aux2 (CT ct, int serial, int alternate, char *cracked, char *buffer
 	else
 	    list_switch (ct, -1, 1, 0, 0);
 
-	if (xpause && SOprintf ("Press <return> to show content..."))
-	    printf ("Press <return> to show content...");
-
-	if (xpause) {
+	if (xpause && isatty (fileno (stdout))) {
 	    int	intr;
+
+	    if (SOprintf ("Press <return> to show content..."))
+		printf ("Press <return> to show content...");
 	    SIGNAL_HANDLER istat;
 
 	    istat = SIGNAL (SIGINT, intrser);