X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=fe9a6269e3cb40a8c19cf6f587f34fc9ab753a9a;hb=cde17f8d38bf9306df4706ac2acb528a2a686a29;hp=b7452d8a1b8cc3d39d714b8279d97511c6fc6f91;hpb=a4605f68e8ff04d4539e402a6fb00ff188944e1c;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index b7452d8..fe9a626 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>
@@ -41,15 +40,11 @@ int nolist   = 0;
 char *progsw = NULL;
 
 /* flags for moreproc/header display */
-int nomore   = 0;
 char *formsw = NULL;
 
 pid_t xpid = 0;
 
 
-/* termsbr.c */
-int SOprintf(char *, ...);
-
 /* mhparse.c */
 int pidcheck(int);
 
@@ -191,7 +186,7 @@ static void
 DisplayMsgHeader(CT ct, char *form)
 {
 	pid_t child_id;
-	int i, vecp;
+	int vecp;
 	char *vec[8];
 
 	vecp = 0;
@@ -201,13 +196,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;
 	}
@@ -215,10 +205,7 @@ DisplayMsgHeader(CT ct, char *form)
 
 	fflush(stdout);
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-		sleep(5);
-
-	switch (child_id) {
+	switch (child_id = fork()) {
 	case NOTOK:
 		adios("fork", "unable to");
 		/* NOTREACHED */
@@ -529,7 +516,6 @@ show_content_aux2(CT ct, int serial, int alternate, char *cracked,
 	char *buffer, int fd, int xlist, int xstdin, int xtty)
 {
 	pid_t child_id;
-	int i;
 	char *vec[4], exec[BUFSIZ + sizeof "exec "];
 
 	if (debugsw || cracked) {
@@ -569,9 +555,7 @@ show_content_aux2(CT ct, int serial, int alternate, char *cracked,
 
 	fflush(stdout);
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-		sleep(5);
-	switch (child_id) {
+	switch (child_id = fork()) {
 	case NOTOK:
 		advise("fork", "unable to");
 		(*ct->c_ceclosefnx) (ct);
@@ -632,8 +616,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);
 	}