X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=c2bb48a0bd454b017dad6a83ecb75d5d189f8785;hb=19f0a0fb37951be3155401e02425cb25365ff601;hp=a63b8ed428bbf85315444680d84d59012637378f;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index a63b8ed..c2bb48a 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -19,20 +19,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-/*
- * Just use sigjmp/longjmp on older machines that
- * don't have sigsetjmp/siglongjmp.
- */
-#ifndef HAVE_SIGSETJMP
-# define sigjmp_buf jmp_buf
-# define sigsetjmp(env,mask) setjmp(env)
-# define siglongjmp(env,val) longjmp(env,val)
-#endif
+#include <sys/wait.h>
 
 extern int debugsw;
 
@@ -88,7 +75,7 @@ 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);
+static void intrser (int);
 
 
 /*
@@ -132,11 +119,7 @@ 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
      * the viewer (e.g., lynx) are going to be accessible */
@@ -170,11 +153,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;
     }
 
@@ -744,7 +723,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);
@@ -783,11 +762,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) {
@@ -802,11 +777,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;
@@ -1110,7 +1081,7 @@ show_external (CT ct, int serial, int alternate)
 }
 
 
-static RETSIGTYPE
+static void
 intrser (int i)
 {
 #ifndef RELIABLE_SIGNALS