Use the same mh_hostname() function from test/common.h in mhsign(1)

[mmh] / sbr / pidwait.c

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index 607538f..ba9bae2 100644 (file)
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -1,58 +1,38 @@
-
 /*
- * pidwait.c -- wait for child to exit
- *
- * $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.
- */
+** pidwait.c -- wait for child to exit
+**
+** 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>
 #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)
+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 */
-       istat = SIGNAL (SIGINT, SIG_IGN);
-       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 */
-       SIGNAL (SIGINT, istat);
-       SIGNAL (SIGQUIT, qstat);
-    }
-
-#ifdef HAVE_UNION_WAIT
-    return (pid == -1 ? -1 : status.w_status);
-#else
-    return (pid == -1 ? -1 : status);
-#endif
+       pid_t pid;
+       SIGNAL_HANDLER istat = NULL, qstat = NULL;
+       int status;
+
+       if (sigsok == -1) {
+               /* ignore a couple of signals */
+               istat = SIGNAL(SIGINT, SIG_IGN);
+               qstat = SIGNAL(SIGQUIT, SIG_IGN);
+       }
+
+       while ((pid = waitpid(id, &status, 0)) == -1 && errno == EINTR)
+               ;
+
+       if (sigsok == -1) {
+               /* reset the signal handlers */
+               SIGNAL(SIGINT, istat);
+               SIGNAL(SIGQUIT, qstat);
+       }
+
+       return (pid == -1 ? -1 : status);
 }