X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e6082c44cba0749864df4db1e0ce43fb9ce2a68a..c17fbc69c337402f9f98ce9c7fe4268c8f070d0c:/sbr/pidwait.c?ds=sidebyside

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index 0bbe5880..5ea87c54 100644
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -2,29 +2,24 @@
 /*
  * 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 <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;
-    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 +27,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 +36,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
 }