projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Backport fix from trunk for SASL bug.
[mmh]
/
sbr
/
pidwait.c
diff --git
a/sbr/pidwait.c
b/sbr/pidwait.c
index
a1555bb
..
6043bee
100644
(file)
--- a/
sbr/pidwait.c
+++ b/
sbr/pidwait.c
@@
-11,6
+11,7
@@
#include <h/mh.h>
#include <h/signals.h>
#include <h/mh.h>
#include <h/signals.h>
+#include <errno.h>
#include <signal.h>
#ifdef HAVE_SYS_WAIT_H
#include <signal.h>
#ifdef HAVE_SYS_WAIT_H
@@
-23,10
+24,10
@@
pidwait (pid_t id, int sigsok)
pid_t pid;
SIGNAL_HANDLER istat, qstat;
pid_t pid;
SIGNAL_HANDLER istat, qstat;
-#ifdef WAITINT
- int status;
-#else
+#ifdef HAVE_UNION_WAIT
union wait status;
union wait status;
+#else
+ int status;
#endif
if (sigsok == -1) {
#endif
if (sigsok == -1) {
@@
-36,7
+37,8
@@
pidwait (pid_t id, int sigsok)
}
#ifdef HAVE_WAITPID
}
#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;
#else
while ((pid = wait(&status)) != -1 && pid != id)
continue;
@@
-48,9
+50,9
@@
pidwait (pid_t id, int sigsok)
SIGNAL (SIGQUIT, qstat);
}
SIGNAL (SIGQUIT, qstat);
}
-#ifdef WAITINT
- return (pid == -1 ? -1 : status);
-#else
+#ifdef HAVE_UNION_WAIT
return (pid == -1 ? -1 : status.w_status);
return (pid == -1 ? -1 : status.w_status);
+#else
+ return (pid == -1 ? -1 : status);
#endif
}
#endif
}