X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Fmhshowsbr.c;h=38167c8fdca91ddb489c52bc8d05a1cf7f01f2d5;hb=0c648c7c1509760370d4c4267a45a5a305885e7f;hp=e05dddfb89877ccbd530ddc68d786c9f529d2ecf;hpb=39e87a75b5c2d3572ec72e717720b44af291e88a;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index e05dddf..38167c8 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -17,10 +17,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
 
 /*
 ** Just use sigjmp/longjmp on older machines that
@@ -36,18 +33,10 @@ extern int debugsw;
 
 int serialsw = 0;
 int nolist   = 0;
-
-char *progsw = NULL;
-
-/* flags for moreproc/header display */
 char *formsw = NULL;
-
 pid_t xpid = 0;
 
 
-/* termsbr.c */
-int SOprintf(char *, ...);
-
 /* mhparse.c */
 int pidcheck(int);
 
@@ -124,12 +113,7 @@ static void
 show_single_message(CT ct, char *form)
 {
 	sigset_t set, oset;
-
-#ifdef HAVE_UNION_WAIT
-	union wait status;
-#else
 	int status;
-#endif
 
 	/*
 	** Allow user executable bit so that temporary directories created by
@@ -165,11 +149,7 @@ show_single_message(CT ct, char *form)
 	SIGPROCMASK(SIG_BLOCK, &set, &oset);
 
 	while (wait(&status) != NOTOK) {
-#ifdef HAVE_UNION_WAIT
-		pidcheck(status.w_status);
-#else
 		pidcheck(status);
-#endif
 		continue;
 	}
 
@@ -182,44 +162,34 @@ show_single_message(CT ct, char *form)
 
 
 /*
-** Use the mhlproc to show the header fields
+** Use mhl to show the header fields
 */
-
 static void
 DisplayMsgHeader(CT ct, char *form)
 {
 	pid_t child_id;
-	int i, vecp;
+	int vecp;
 	char *vec[8];
 
 	vecp = 0;
-	vec[vecp++] = mhbasename(mhlproc);
+	vec[vecp++] = "mhl";
 	vec[vecp++] = "-form";
 	vec[vecp++] = form;
 	vec[vecp++] = "-nobody";
 	vec[vecp++] = ct->c_file;
-
-	/* If we've specified -moreproc, then just pass that along. */
-	if (progsw) {
-		vec[vecp++] = "-moreproc";
-		vec[vecp++] = progsw;
-	}
 	vec[vecp] = NULL;
 
 	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 */
 
 	case OK:
-		execvp(mhlproc, vec);
+		execvp("mhl", vec);
 		fprintf(stderr, "unable to exec ");
-		perror(mhlproc);
+		perror("mhl");
 		_exit(-1);
 		/* NOTREACHED */
 
@@ -522,7 +492,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) {
@@ -562,9 +531,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);
@@ -624,9 +591,7 @@ show_text(CT ct, int serial, int alternate)
 	** if it is not a text part of a multipart/alternative
 	*/
 	if (!alternate || ct->c_subtype == TEXT_PLAIN) {
-		snprintf(buffer, sizeof(buffer), "%%p%s '%%F'",
-				progsw ? progsw : moreproc && *moreproc ?
-				moreproc : "more");
+		snprintf(buffer, sizeof(buffer), "%%p%s '%%F'", defaultpager);
 		cp = (ct->c_showproc = getcpy(buffer));
 		return show_content_aux(ct, serial, alternate, cp, NULL);
 	}
@@ -723,7 +688,7 @@ show_multi_internal(CT ct, int serial, int alternate)
 	for (part = m->mp_parts; part; part = part->mp_next) {
 		p = part->mp_part;
 
-		if (part_ok(p, 0) && type_ok(p, 0)) {
+		if (part_ok(p, 1) && type_ok(p, 1)) {
 			int inneresult;
 
 			inneresult = show_switch(p, nowserial, nowalternate);
@@ -762,11 +727,7 @@ show_multi_internal(CT ct, int serial, int alternate)
 	if (serial && !nowserial) {
 		pid_t pid;
 		int kids;
-#ifdef HAVE_UNION_WAIT
-		union wait status;
-#else
 		int status;
-#endif
 
 		kids = 0;
 		for (part = m->mp_parts; part; part = part->mp_next) {
@@ -781,11 +742,7 @@ show_multi_internal(CT ct, int serial, int alternate)
 		}
 
 		while (kids > 0 && (pid = wait(&status)) != NOTOK) {
-#ifdef HAVE_UNION_WAIT
-			pidcheck(status.w_status);
-#else
 			pidcheck(status);
-#endif
 
 			for (part = m->mp_parts; part; part = part->mp_next) {
 				p = part->mp_part;