X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6c42153ad9362cc676ea66563bf400d7511b3b68..f9af1bc563cd2ead96ac6b5e4a22ae095f3d63f3:/sbr/pidwait.c

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index a1555bbe..8ccc6891 100644
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -1,33 +1,20 @@
-
-/*
- * pidwait.c -- wait for child to exit
- *
- * $Id$
+/* 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 <signal.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include "h/mh.h"
+#include "h/signals.h"
 
 int
 pidwait (pid_t id, int sigsok)
 {
     pid_t pid;
-    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 */
@@ -35,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 */
@@ -48,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;
 }