X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=c81cf92d1edb7c82d21e336cf7abfc48774ec98f;hp=ee401a78927b1dfaddfa47c540190236f8086d0e;hb=dee26acad9bca6aec7dca5c428b07a386909081b;hpb=d3ba09a465cb0e5fc9a74d0b152a7ed965f895cb

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index ee401a7..c81cf92 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
@@ -35,20 +34,16 @@
 
 extern int debugsw;
 
-int pausesw  = 1;
 int serialsw = 0;
 int nolist   = 0;
 
 char *progsw = NULL;
 
 /* flags for moreproc/header display */
-int nomore   = 0;
 char *formsw = NULL;
 
 pid_t xpid = 0;
 
-static sigjmp_buf intrenv;
-
 
 /* termsbr.c */
 int SOprintf(char *, ...);
@@ -79,8 +74,7 @@ static void show_single_message(CT, char *);
 static void DisplayMsgHeader(CT, char *);
 static int show_switch(CT, int, int);
 static int show_content(CT, int, int);
-static int show_content_aux2(CT, int, int, char *, char *,
-		int, int, int, int, int);
+static int show_content_aux2(CT, int, int, char *, char *, int, int, int, int);
 static int show_text(CT, int, int);
 static int show_multi(CT, int, int);
 static int show_multi_internal(CT, int, int);
@@ -88,7 +82,6 @@ static int show_multi_aux(CT, int, int, char *);
 static int show_message_rfc822(CT, int, int);
 static int show_partial(CT, int, int);
 static int show_external(CT, int, int);
-static RETSIGTYPE intrser(int);
 
 
 /*
@@ -206,13 +199,8 @@ DisplayMsgHeader(CT ct, char *form)
 	vec[vecp++] = "-nobody";
 	vec[vecp++] = ct->c_file;
 
-	/*
-	** If we've specified -(no)moreproc,
-	** then just pass that along.
-	*/
-	if (nomore) {
-		vec[vecp++] = "-nomoreproc";
-	} else if (progsw) {
+	/* If we've specified -moreproc, then just pass that along. */
+	if (progsw) {
 		vec[vecp++] = "-moreproc";
 		vec[vecp++] = progsw;
 	}
@@ -333,7 +321,7 @@ int
 show_content_aux(CT ct, int serial, int alternate, char *cp, char *cracked)
 {
 	int fd, len, buflen, quoted;
-	int xstdin, xlist, xpause, xtty;
+	int xstdin, xlist, xtty;
 	char *bp, *pp, *file, buffer[BUFSIZ];
 	CI ci = &ct->c_ctinfo;
 
@@ -352,7 +340,6 @@ show_content_aux(CT ct, int serial, int alternate, char *cp, char *cracked)
 		return (alternate ? DONE : OK);
 
 	xlist  = 0;
-	xpause = 0;
 	xstdin = 0;
 	xtty   = 0;
 
@@ -430,10 +417,6 @@ show_content_aux(CT ct, int serial, int alternate, char *cp, char *cracked)
 				break;
 
 			case 'p':
-				/* %l, and pause prior to displaying content */
-				xpause = pausesw;
-				/* and fall... */
-
 			case 'l':
 				/*
 				** display listing prior to displaying content
@@ -526,7 +509,7 @@ raw:
 
 got_command:
 	return show_content_aux2(ct, serial, alternate, cracked, buffer,
-			fd, xlist, xpause, xstdin, xtty);
+			fd, xlist, xstdin, xtty);
 }
 
 
@@ -536,7 +519,7 @@ got_command:
 
 static int
 show_content_aux2(CT ct, int serial, int alternate, char *cracked,
-	char *buffer, int fd, int xlist, int xpause, int xstdin, int xtty)
+	char *buffer, int fd, int xlist, int xstdin, int xtty)
 {
 	pid_t child_id;
 	int i;
@@ -564,33 +547,10 @@ show_content_aux2(CT ct, int serial, int alternate, char *cracked,
 	}
 
 	if (xlist) {
-		char prompt[BUFSIZ];
-
 		if (ct->c_type == CT_MULTIPART)
 			list_content(ct, -1, 1, 0, 0);
 		else
 			list_switch(ct, -1, 1, 0, 0);
-
-		if (xpause && SOprintf("Press <return> to show content..."))
-			printf("Press <return> to show content...");
-
-		if (xpause) {
-			int intr;
-			SIGNAL_HANDLER istat;
-
-			istat = SIGNAL(SIGINT, intrser);
-			if ((intr = sigsetjmp(intrenv, 1)) == OK) {
-				fflush(stdout);
-				prompt[0] = 0;
-				read(fileno(stdout), prompt, sizeof(prompt));
-			}
-			SIGNAL(SIGINT, istat);
-			if (intr != OK || prompt[0] == 'n') {
-				(*ct->c_ceclosefnx) (ct);
-				return (alternate ? DONE : NOTOK);
-			}
-			if (prompt[0] == 'q') done(OK);
-		}
 	}
 
 	snprintf(exec, sizeof(exec), "exec %s", buffer);
@@ -665,8 +625,7 @@ show_text(CT ct, int serial, int alternate)
 	*/
 	if (!alternate || ct->c_subtype == TEXT_PLAIN) {
 		snprintf(buffer, sizeof(buffer), "%%p%s '%%F'",
-				progsw ? progsw : moreproc && *moreproc ?
-				moreproc : "more");
+				progsw ? progsw : moreproc);
 		cp = (ct->c_showproc = getcpy(buffer));
 		return show_content_aux(ct, serial, alternate, cp, NULL);
 	}
@@ -860,7 +819,7 @@ static int
 show_multi_aux(CT ct, int serial, int alternate, char *cp)
 {
 	int len, buflen, quoted;
-	int xlist, xpause, xtty;
+	int xlist, xtty;
 	char *bp, *pp, *file, buffer[BUFSIZ];
 	struct multipart *m = (struct multipart *) ct->c_ctparams;
 	struct part *part;
@@ -891,7 +850,6 @@ show_multi_aux(CT ct, int serial, int alternate, char *cp)
 	}
 
 	xlist = 0;
-	xpause = 0;
 	xtty = 0;
 
 	/* get buffer ready to go */
@@ -970,10 +928,6 @@ show_multi_aux(CT ct, int serial, int alternate, char *cp)
 			break;
 
 			case 'p':
-				/* %l, and pause prior to displaying content */
-				xpause = pausesw;
-				/* and fall... */
-
 			case 'l':
 				/*
 				** display listing prior to displaying content
@@ -1066,7 +1020,7 @@ raw:
 	}
 
 	return show_content_aux2(ct, serial, alternate, NULL, buffer,
-			NOTOK, xlist, xpause, 0, xtty);
+			NOTOK, xlist, 0, xtty);
 }
 
 
@@ -1143,15 +1097,3 @@ show_external(CT ct, int serial, int alternate)
 	return NOTOK;
 #endif
 }
-
-
-static RETSIGTYPE
-intrser(int i)
-{
-#ifndef RELIABLE_SIGNALS
-	SIGNAL(SIGINT, intrser);
-#endif
-
-	putchar('\n');
-	siglongjmp(intrenv, DONE);
-}