#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;
SIGNAL_HANDLER istat = NULL, qstat = NULL;
-
-#ifdef HAVE_UNION_WAIT
- union wait status;
-#else
int status;
-#endif
if (sigsok == -1) {
/* ignore a couple of signals */
qstat = SIGNAL(SIGQUIT, SIG_IGN);
}
-#ifdef HAVE_WAITPID
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 handlers */
SIGNAL(SIGQUIT, qstat);
}
-#ifdef HAVE_UNION_WAIT
- return (pid == -1 ? -1 : status.w_status);
-#else
return (pid == -1 ? -1 : status);
-#endif
}