/*
* 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
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
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
- 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);
+ /* ignore a couple of signals */
+ istat = SIGNAL (SIGINT, SIG_IGN);
+ qstat = SIGNAL (SIGQUIT, SIG_IGN);
}
-#ifdef HAVE_WAITPID
- pid = waitpid(id, &status, 0);
-#else
- while ((pid = wait(&status)) != -1 && pid != id)
- continue;
-#endif
+ while ((pid = waitpid(id, &status, 0)) == -1 && errno == EINTR)
+ ;
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
- return (pid == -1 ? -1 : status.w_status);
-#endif
}