X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=550669aa0e66d3d8bbfa2b1ae04a257961d6e687;hb=a71e7d9a788e0b21ada5f1218724843f10432936;hp=c60acb9d88980ba119ae5a591efaafa18ffd3158;hpb=88b27ae07f694e90637c2a852b754539c2f70172;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index c60acb9..550669a 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -12,7 +12,7 @@
 #include <h/signals.h>
 #include <h/md5.h>
 #include <errno.h>
-#include <h/m_setjmp.h>
+#include <setjmp.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
@@ -38,12 +38,6 @@ pid_t xpid = 0;
 static sigjmp_buf intrenv;
 
 
-/* termsbr.c */
-int SOprintf (char *, ...);
-
-/* mhparse.c */
-int pidcheck (int);
-
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
@@ -533,15 +527,15 @@ 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;
 	    SIGNAL_HANDLER istat;
 
+	    if (SOprintf ("Press <return> to show content..."))
+		printf ("Press <return> to show content...");
+
 	    istat = SIGNAL (SIGINT, intrser);
-	    if ((intr = m_sigsetjmp (intrenv, 1)) == OK) {
+	    if ((intr = sigsetjmp (intrenv, 1)) == OK) {
 		fflush (stdout);
 		prompt[0] = 0;
 		read (fileno (stdout), prompt, sizeof(prompt));
@@ -986,7 +980,7 @@ raw:
     }
 
     if (buflen <= 0 ||
-        (ct->c_termproc && (size_t) buflen <= strlen(ct->c_termproc))) {
+        (ct->c_termproc && buflen <= (ssize_t) strlen(ct->c_termproc))) {
 	/* content_error would provide a more useful error message
 	 * here, except that if we got overrun, it probably would
 	 * too.