X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=4a3589f5164ed67502bd21c4b175e626e3b4cb14;hp=d7d4d1415d86c75d0722f1895e49353d78108087;hb=f480c03187724e54e5391ee61b810827da319a6c;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index d7d4d14..4a3589f 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>
@@ -35,7 +34,6 @@
 # define siglongjmp(env,val) longjmp(env,val)
 #endif
 
-extern int errno;
 extern int debugsw;
 
 int pausesw  = 1;
@@ -119,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);
     }
 }
@@ -134,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
@@ -172,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;
     }
@@ -302,13 +300,13 @@ show_content (CT ct, int serial, int alternate)
     char *cp, buffer[BUFSIZ];
     CI ci = &ct->c_ctinfo;
 
-    /* Check for mhn-show-type/subtype */
+    /* Check for mhshow-show-type/subtype */
     snprintf (buffer, sizeof(buffer), "%s-show-%s/%s",
 		invo_name, ci->ci_type, ci->ci_subtype);
     if ((cp = context_find (buffer)) && *cp != '\0')
 	return show_content_aux (ct, serial, alternate, cp, NULL);
 
-    /* Check for mhn-show-type */
+    /* Check for mhshow-show-type */
     snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
     if ((cp = context_find (buffer)) && *cp != '\0')
 	return show_content_aux (ct, serial, alternate, cp, NULL);
@@ -632,13 +630,13 @@ show_text (CT ct, int serial, int alternate)
     char *cp, buffer[BUFSIZ];
     CI ci = &ct->c_ctinfo;
 
-    /* Check for mhn-show-type/subtype */
+    /* Check for mhshow-show-type/subtype */
     snprintf (buffer, sizeof(buffer), "%s-show-%s/%s",
 		invo_name, ci->ci_type, ci->ci_subtype);
     if ((cp = context_find (buffer)) && *cp != '\0')
 	return show_content_aux (ct, serial, alternate, cp, NULL);
 
-    /* Check for mhn-show-type */
+    /* Check for mhshow-show-type */
     snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
     if ((cp = context_find (buffer)) && *cp != '\0')
 	return show_content_aux (ct, serial, alternate, cp, NULL);
@@ -668,13 +666,13 @@ show_multi (CT ct, int serial, int alternate)
     char *cp, buffer[BUFSIZ];
     CI ci = &ct->c_ctinfo;
 
-    /* Check for mhn-show-type/subtype */
+    /* Check for mhshow-show-type/subtype */
     snprintf (buffer, sizeof(buffer), "%s-show-%s/%s",
 		invo_name, ci->ci_type, ci->ci_subtype);
     if ((cp = context_find (buffer)) && *cp != '\0')
 	return show_multi_aux (ct, serial, alternate, cp);
 
-    /* Check for mhn-show-type */
+    /* Check for mhshow-show-type */
     snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
     if ((cp = context_find (buffer)) && *cp != '\0')
 	return show_multi_aux (ct, serial, alternate, cp);
@@ -785,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;
@@ -804,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) {
@@ -1047,13 +1045,13 @@ show_message_rfc822 (CT ct, int serial, int alternate)
     char *cp, buffer[BUFSIZ];
     CI ci = &ct->c_ctinfo;
 
-    /* Check for mhn-show-type/subtype */
+    /* Check for mhshow-show-type/subtype */
     snprintf (buffer, sizeof(buffer), "%s-show-%s/%s",
 		invo_name, ci->ci_type, ci->ci_subtype);
     if ((cp = context_find (buffer)) && *cp != '\0')
 	return show_content_aux (ct, serial, alternate, cp, NULL);
 
-    /* Check for mhn-show-type */
+    /* Check for mhshow-show-type */
     snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
     if ((cp = context_find (buffer)) && *cp != '\0')
 	return show_content_aux (ct, serial, alternate, cp, NULL);