X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fpidwait.c;h=ef42e1aa3d881523013fcc5d3776cbcb9cdb516e;hb=56a34bc502bde807ab722ee5f20d4db2901a5b23;hp=4bd02e3e576669007d3963ac6e827870c12479e9;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index 4bd02e3..ef42e1a 100644
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -2,11 +2,14 @@
 /*
  * 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,37 +20,37 @@ int
 pidwait (pid_t id, int sigsok)
 {
     pid_t pid;
-    sigset_t set, oset;
+    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) {
-	/* block a couple of signals */
-	sigemptyset (&set);
-	sigaddset (&set, SIGINT);
-	sigaddset (&set, SIGQUIT);
-	SIGPROCMASK (SIG_BLOCK, &set, &oset);
+	/* ignore a couple of signals */
+	istat = SIGNAL (SIGINT, SIG_IGN);
+	qstat = SIGNAL (SIGQUIT, SIG_IGN);
     }
 
 #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;
 #endif
 
     if (sigsok == -1) {
-	/* reset the signal mask */
-	SIGPROCMASK (SIG_SETMASK, &oset, &set);
+	/* reset the signal handlers */
+	SIGNAL (SIGINT, istat);
+	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
 }