Clean up process wait to use POSIX waitpid() interface.

Merged from nmh. Thanks to Lyndon Nerenberg.

diff --git a/configure.ac b/configure.ac
index 8c9262ba447415038d704e63d0cea71654e71b42..9fd84c85228e64697fee89db630321a2c84e5c15 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -337,7 +337,6 @@ AC_SUBST(OURDEFS)
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_TIME
-AC_HEADER_SYS_WAIT
 AC_HEADER_STAT
 AC_HEADER_TIOCGWINSZ
 AC_CHECK_HEADERS(fcntl.h crypt.h termcap.h \
@@ -363,7 +362,7 @@ AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1,
 dnl ---------------
 dnl CHECK FUNCTIONS
 dnl ---------------
-AC_CHECK_FUNCS(waitpid sigaction sigprocmask sigblock sigsetmask \
+AC_CHECK_FUNCS(sigaction sigprocmask sigblock sigsetmask \
                sighold sigrelse lstat tzset \
                getutent nl_langinfo mbtowc wcwidth)
 
@@ -574,34 +573,6 @@ AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,,
 
 AC_CHECK_MEMBERS(struct utmp.ut_type,,,[#include <utmp.h>])
 
-AC_MSG_CHECKING(for union wait)
-AC_CACHE_VAL(nmh_cv_union_wait, [dnl
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-#include <sys/wait.h>]],
-    [[union wait status; int pid; pid = wait (&status);
-#ifdef WEXITSTATUS
-/* Some POSIXoid systems have both the new-style macros and the old
-   union wait type, and they do not work together.  If union wait
-   conflicts with WEXITSTATUS et al, we don't want to use it at all.  */
-        if (WEXITSTATUS (status) != 0) pid = -1;
-#ifdef WTERMSIG
-        /* If we have WEXITSTATUS and WTERMSIG, just use them on ints.  */
-        -- blow chunks here --
-#endif
-#endif
-#ifdef HAVE_WAITPID
-        /* Make sure union wait works with waitpid.  */
-        pid = waitpid (-1, &status, 0);
-#endif
-      ]])],
-    [nmh_cv_union_wait=yes],
-    [nmh_cv_union_wait=no])])
-if test "$nmh_cv_union_wait" = yes; then
-  AC_DEFINE(HAVE_UNION_WAIT, 1,
-    [Define to 1 if you have the \`union wait' type in <sys/wait.h>.])
-fi
-AC_MSG_RESULT($nmh_cv_union_wait)
-
 CHECK_TYPE_STRUCT_DIRENT_D_TYPE()
 
 dnl -------------

diff --git a/sbr/pidstatus.c b/sbr/pidstatus.c
index f845058acab1071f5b4d990157898f5973bfd13b..a9befee5f71303fe31546ef53e220ac01bd47269 100644 (file)
--- a/sbr/pidstatus.c
+++ b/sbr/pidstatus.c
@@ -12,10 +12,7 @@
 ** auto-generated header
 */
 #include <sigmsg.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
 
 #ifndef WTERMSIG
 # define WTERMSIG(s) ((int)((s) & 0x7F))

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index ebee02ecdcb8e001ec8aa4f0888b080d73c145d6..ba9bae21bf996a84eb74b49642a72e04f9c48c15 100644 (file)
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -10,22 +10,14 @@
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
 
 int
 pidwait(pid_t id, int sigsok)
 {
        pid_t pid;
        SIGNAL_HANDLER istat = NULL, qstat = NULL;
-
-#ifdef HAVE_UNION_WAIT
-       union wait status;
-#else
        int status;
-#endif
 
        if (sigsok == -1) {
                /* ignore a couple of signals */
@@ -33,13 +25,8 @@ pidwait(pid_t id, int sigsok)
                qstat = SIGNAL(SIGQUIT, SIG_IGN);
        }
 
-#ifdef HAVE_WAITPID
        while ((pid = waitpid(id, &status, 0)) == -1 && errno == EINTR)
                ;
-#else
-       while ((pid = wait(&status)) != -1 && pid != id)
-               continue;
-#endif
 
        if (sigsok == -1) {
                /* reset the signal handlers */
@@ -47,9 +34,5 @@ pidwait(pid_t id, int sigsok)
                SIGNAL(SIGQUIT, qstat);
        }
 
-#ifdef HAVE_UNION_WAIT
-       return (pid == -1 ? -1 : status.w_status);
-#else
        return (pid == -1 ? -1 : status);
-#endif
 }

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 3ed31f98fbc9ec2021c3f2d051d1056e16252f6d..06a353acf9b7d64157763d401877ee952b146d7c 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -36,10 +36,6 @@
 # endif
 #endif
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 static struct swit switches[] = {
 #define CHECKSW  0
        { "check", 0 },

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 7bd4cfbf41445a34e5e911ade80e5be47f38e9fb..975d2e13a13ee167a920c917f4e1a72257c27529 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -30,10 +30,6 @@
 # endif
 #endif
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 extern int debugsw;
 
 extern pid_t xpid;  /* mhshowsbr.c or mhbuild.c */

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 8902f7595f206e493c813b0cb08bd6e9da643e3a..a06a6787d31fb41d1b9c715fd6adffade015ffd4 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -18,10 +18,6 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 static struct swit switches[] = {
 #define CHECKSW  0
        { "check", 0 },

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 00b538ca20c31ac9554fbd0210b0044119eb63b8..f82cc6c35094fe806cbc5f5dfff054a210631c4e 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -17,11 +17,6 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-
 extern int ebcdicsw;
 
 static char ebcdicsafe[0x100] = {

diff --git a/uip/mhparse.c b/uip/mhparse.c
index ece4e8fe6dfae7ad84588b3d39dd92548552b461..d38f251563293e011cfff3eb4091553760cd593b 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -18,11 +18,6 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-
 extern int debugsw;
 
 extern int endian;  /* mhmisc.c */

diff --git a/uip/mhshow.c b/uip/mhshow.c
index bbd99eaaaff13891acdd15132828863049f22754..6d91e596ce9640a28bf3f6d8aae0cbc9a98d5704 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -18,10 +18,6 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 static struct swit switches[] = {
 #define CHECKSW  0
        { "check", 0 },

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 3e730cec5d8d22f1383e26fe1390d486bedd3319..38167c8fdca91ddb489c52bc8d05a1cf7f01f2d5 100644 (file)
--- 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;
        }
 
@@ -739,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) {
@@ -758,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;

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 2ed6a42b7d5985c2167f6b0f5f8c75fa5d092223..1c4cee641d2d544d879a14b84df06163839dfd72 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -19,10 +19,6 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 static struct swit switches[] = {
 #define AUTOSW  0
        { "auto", 0 },

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 7dc9c07d91d3da6319e7a44ac5f4aa2fab5872a1..f6c14fbd671094eda2ff4491268bec908f803b03 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -18,10 +18,6 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 static struct swit switches[] = {
 #define CHECKSW  0
        { "check", 0 },