X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=d3397aea8886a8a87cb0e645cb93487adecc6c03;hb=a93204a5abced109070990a2b9d567344f352cbd;hp=489993914eefdb126086a1f9c16315473cb8111a;hpb=dee387b53ab0d42922f857b60d6f980c9e79d16f;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 4899939..d3397ae 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -2,7 +2,9 @@
 /*
  * mhshowsbr.c -- routines to display the contents of MIME messages
  *
- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
@@ -16,10 +18,7 @@
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <h/utils.h>
 
 /*
  * Just use sigjmp/longjmp on older machines that
@@ -31,7 +30,6 @@
 # define siglongjmp(env,val) longjmp(env,val)
 #endif
 
-extern int errno;
 extern int debugsw;
 
 int pausesw  = 1;
@@ -115,7 +113,7 @@ show_all_messages (CT *cts)
 	ct = *ctp;
 
 	/* if top-level type is ok, then display message */
-	if (type_ok (ct, 0))
+	if (type_ok (ct, 1))
 	    show_single_message (ct, formsw);
     }
 }
@@ -130,11 +128,7 @@ show_single_message (CT ct, char *form)
 {
     sigset_t set, oset;
 
-#ifdef WAITINT
     int status;
-#else
-    union wait status;
-#endif
 
     /* Allow user executable bit so that temporary directories created by
      * the viewer (e.g., lynx) are going to be accessible */
@@ -168,11 +162,7 @@ show_single_message (CT ct, char *form)
     SIGPROCMASK (SIG_BLOCK, &set, &oset);
 
     while (wait (&status) != NOTOK) {
-#ifdef WAITINT
 	pidcheck (status);
-#else
-	pidcheck (status.w_status);
-#endif
 	continue;
     }
 
@@ -742,7 +732,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);
@@ -781,11 +771,7 @@ show_multi_internal (CT ct, int serial, int alternate)
     if (serial && !nowserial) {
 	pid_t pid;
 	int kids;
-#ifdef WAITINT
 	int status;
-#else
-	union wait status;
-#endif
 
 	kids = 0;
 	for (part = m->mp_parts; part; part = part->mp_next) {
@@ -800,11 +786,7 @@ show_multi_internal (CT ct, int serial, int alternate)
 	}
 
 	while (kids > 0 && (pid = wait (&status)) != NOTOK) {
-#ifdef WAITINT
 	    pidcheck (status);
-#else
-	    pidcheck (status.w_status);
-#endif
 
 	    for (part = m->mp_parts; part; part = part->mp_next) {
 		p = part->mp_part;