mhlsbr.c: Don't strchr(3) non-string NUL-less buffer.

[nmh] / sbr / pidwait.c

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index 0bbe5880b4f16dcb6e99726659b0a3ff5c9bc334..bd6602cb455a72e7f38626e6ca09cc19f2c42d03 100644 (file)
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -1,30 +1,20 @@
-
-/*
- * pidwait.c -- wait for child to exit
+/* 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.
  */
 
 #include <h/mh.h>
 #include <h/signals.h>
-#include <signal.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
 
 int
 pidwait (pid_t id, int sigsok)
 {
     pid_t pid;
-    sigset_t set, oset;
-    SIGNAL_HANDLER istat, qstat;
+    SIGNAL_HANDLER istat = NULL, qstat = NULL;
 
-#ifdef WAITINT
     int status;
-#else
-    union wait status;
-#endif
 
     if (sigsok == -1) {
        /* ignore a couple of signals */
@@ -32,12 +22,8 @@ pidwait (pid_t id, int sigsok)
        qstat = SIGNAL (SIGQUIT, SIG_IGN);
     }
 
-#ifdef HAVE_WAITPID
-    pid = waitpid(id, &status, 0);
-#else
-    while ((pid = wait(&status)) != -1 && pid != id)
-       continue;
-#endif
+    while ((pid = waitpid(id, &status, 0)) == -1 && errno == EINTR)
+       ;
 
     if (sigsok == -1) {
        /* reset the signal handlers */
@@ -45,9 +31,5 @@ pidwait (pid_t id, int sigsok)
        SIGNAL (SIGQUIT, qstat);
     }
 
-#ifdef WAITINT
-    return (pid == -1 ? -1 : status);
-#else
-    return (pid == -1 ? -1 : status.w_status);
-#endif
+    return pid == -1 ? -1 : status;
 }