* Bug #15213, #18635: The use of the insecure m_scratch() and

[mmh] / sbr / pidwait.c

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index 4bd02e3..607538f 100644 (file)
--- 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,37 +22,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
 }