X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=a63b8ed428bbf85315444680d84d59012637378f;hb=56a34bc502bde807ab722ee5f20d4db2901a5b23;hp=1c786cc664b8e5d0c5fc7bc9f72f3142fe651751;hpb=4885712264980e6cbc2039f9158027bee9213475;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 1c786cc..a63b8ed 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -2,8 +2,6 @@
 /*
  * 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.
@@ -20,6 +18,7 @@
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include <h/utils.h>
 
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
@@ -118,7 +117,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);
     }
 }
@@ -133,10 +132,10 @@ show_single_message (CT ct, char *form)
 {
     sigset_t set, oset;
 
-#ifdef WAITINT
-    int status;
-#else
+#ifdef HAVE_UNION_WAIT
     union wait status;
+#else
+    int status;
 #endif
 
     /* Allow user executable bit so that temporary directories created by
@@ -171,10 +170,10 @@ show_single_message (CT ct, char *form)
     SIGPROCMASK (SIG_BLOCK, &set, &oset);
 
     while (wait (&status) != NOTOK) {
-#ifdef WAITINT
-	pidcheck (status);
-#else
+#ifdef HAVE_UNION_WAIT
 	pidcheck (status.w_status);
+#else
+	pidcheck (status);
 #endif
 	continue;
     }
@@ -784,10 +783,10 @@ show_multi_internal (CT ct, int serial, int alternate)
     if (serial && !nowserial) {
 	pid_t pid;
 	int kids;
-#ifdef WAITINT
-	int status;
-#else
+#ifdef HAVE_UNION_WAIT
 	union wait status;
+#else
+	int status;
 #endif
 
 	kids = 0;
@@ -803,10 +802,10 @@ show_multi_internal (CT ct, int serial, int alternate)
 	}
 
 	while (kids > 0 && (pid = wait (&status)) != NOTOK) {
-#ifdef WAITINT
-	    pidcheck (status);
-#else
+#ifdef HAVE_UNION_WAIT
 	    pidcheck (status.w_status);
+#else
+	    pidcheck (status);
 #endif
 
 	    for (part = m->mp_parts; part; part = part->mp_next) {