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

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 6dae3e8..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
@@ -116,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
@@ -157,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;
 	}
 
@@ -174,9 +162,8 @@ 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)
 {
@@ -185,7 +172,7 @@ DisplayMsgHeader(CT ct, char *form)
 	char *vec[8];
 
 	vecp = 0;
-	vec[vecp++] = mhbasename(mhlproc);
+	vec[vecp++] = "mhl";
 	vec[vecp++] = "-form";
 	vec[vecp++] = form;
 	vec[vecp++] = "-nobody";
@@ -200,9 +187,9 @@ DisplayMsgHeader(CT ct, char *form)
 		/* NOTREACHED */
 
 	case OK:
-		execvp(mhlproc, vec);
+		execvp("mhl", vec);
 		fprintf(stderr, "unable to exec ");
-		perror(mhlproc);
+		perror("mhl");
 		_exit(-1);
 		/* NOTREACHED */
 
@@ -701,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);
@@ -740,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) {
@@ -759,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;