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

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index 4bd02e3..a1555bb 100644
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -3,6 +3,10 @@
  * 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>
@@ -17,7 +21,7 @@ int
 pidwait (pid_t id, int sigsok)
 {
     pid_t pid;
-    sigset_t set, oset;
+    SIGNAL_HANDLER istat, qstat;
 
 #ifdef WAITINT
     int status;
@@ -26,11 +30,9 @@ pidwait (pid_t id, int sigsok)
 #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
@@ -41,8 +43,9 @@ pidwait (pid_t id, int sigsok)
 #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