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

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index 4bd02e3..ba9bae2 100644
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -1,53 +1,38 @@
-
 /*
- * 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 <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)
+pidwait(pid_t id, int sigsok)
 {
-    pid_t pid;
-    sigset_t set, oset;
-
-#ifdef WAITINT
-    int status;
-#else
-    union wait status;
-#endif
-
-    if (sigsok == -1) {
-	/* block a couple of signals */
-	sigemptyset (&set);
-	sigaddset (&set, SIGINT);
-	sigaddset (&set, SIGQUIT);
-	SIGPROCMASK (SIG_BLOCK, &set, &oset);
-    }
-
-#ifdef HAVE_WAITPID
-    pid = waitpid(id, &status, 0);
-#else
-    while ((pid = wait(&status)) != -1 && pid != id)
-	continue;
-#endif
-
-    if (sigsok == -1) {
-	/* reset the signal mask */
-	SIGPROCMASK (SIG_SETMASK, &oset, &set);
-    }
-
-#ifdef WAITINT
-    return (pid == -1 ? -1 : status);
-#else
-    return (pid == -1 ? -1 : status.w_status);
-#endif
+	pid_t pid;
+	SIGNAL_HANDLER istat = NULL, qstat = NULL;
+	int status;
+
+	if (sigsok == -1) {
+		/* ignore a couple of signals */
+		istat = SIGNAL(SIGINT, SIG_IGN);
+		qstat = SIGNAL(SIGQUIT, SIG_IGN);
+	}
+
+	while ((pid = waitpid(id, &status, 0)) == -1 && errno == EINTR)
+		;
+
+	if (sigsok == -1) {
+		/* reset the signal handlers */
+		SIGNAL(SIGINT, istat);
+		SIGNAL(SIGQUIT, qstat);
+	}
+
+	return (pid == -1 ? -1 : status);
 }