X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fpidwait.c;h=607538f557b8d367f4c3c7f348493aa1804f099c;hb=3bf07d227725f798f654ac09f015f35d27ab83cb;hp=0bbe5880b4f16dcb6e99726659b0a3ff5c9bc334;hpb=e6082c44cba0749864df4db1e0ce43fb9ce2a68a;p=mmh

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index 0bbe588..607538f 100644
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -3,10 +3,15 @@
  * 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
@@ -17,13 +22,12 @@ 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
+#ifdef HAVE_UNION_WAIT
     union wait status;
+#else
+    int status;
 #endif
 
     if (sigsok == -1) {
@@ -33,7 +37,8 @@ pidwait (pid_t id, int sigsok)
     }
 
 #ifdef HAVE_WAITPID
-    pid = waitpid(id, &status, 0);
+    while ((pid = waitpid(id, &status, 0)) == -1 && errno == EINTR)
+	;
 #else
     while ((pid = wait(&status)) != -1 && pid != id)
 	continue;
@@ -45,9 +50,9 @@ pidwait (pid_t id, int sigsok)
 	SIGNAL (SIGQUIT, qstat);
     }
 
-#ifdef WAITINT
-    return (pid == -1 ? -1 : status);
-#else
+#ifdef HAVE_UNION_WAIT
     return (pid == -1 ? -1 : status.w_status);
+#else
+    return (pid == -1 ? -1 : status);
 #endif
 }