X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=99db9f83a418cfca89523af7f94b0149a6d2811f;hb=d8c7d4f2c785d35cebd5ea64213a335561a57f7d;hp=ae90a7b524c12d7bd9a230b0b82c4cbc8e7366d9;hpb=4548981fb45fbc917cc2c26b7c96b31cfa14bc9b;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index ae90a7b..99db9f8 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);
@@ -197,7 +191,7 @@ DisplayMsgHeader (CT ct, char *form)
 
     fflush (stdout);
 
-    for (i = 0; (child_id = m_vfork()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
 	sleep (5);
 
     switch (child_id) {
@@ -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));
@@ -564,7 +558,7 @@ show_content_aux2 (CT ct, int serial, int alternate, char *cracked, char *buffer
 
     fflush (stdout);
 
-    for (i = 0; (child_id = m_vfork()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
 	sleep (5);
     switch (child_id) {
 	case NOTOK: