- 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);