projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mhl and mhbuild ignore to long lines
[mmh]
/
sbr
/
pidwait.c
diff --git
a/sbr/pidwait.c
b/sbr/pidwait.c
index
65c55b9
..
ba9bae2
100644
(file)
--- a/
sbr/pidwait.c
+++ b/
sbr/pidwait.c
@@
-10,46
+10,29
@@
#include <h/signals.h>
#include <errno.h>
#include <signal.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
int
-pidwait (pid_t id, int sigsok)
+pidwait(pid_t id, int sigsok)
{
pid_t pid;
SIGNAL_HANDLER istat = NULL, qstat = NULL;
{
pid_t pid;
SIGNAL_HANDLER istat = NULL, qstat = NULL;
-
-#ifdef HAVE_UNION_WAIT
- union wait status;
-#else
int status;
int status;
-#endif
if (sigsok == -1) {
/* ignore a couple of signals */
if (sigsok == -1) {
/* ignore a couple of signals */
- istat = SIGNAL (SIGINT, SIG_IGN);
- qstat = SIGNAL (SIGQUIT, SIG_IGN);
+ istat = SIGNAL(SIGINT, SIG_IGN);
+ qstat = SIGNAL(SIGQUIT, SIG_IGN);
}
}
-#ifdef HAVE_WAITPID
while ((pid = waitpid(id, &status, 0)) == -1 && errno == EINTR)
;
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 */
if (sigsok == -1) {
/* reset the signal handlers */
- SIGNAL (SIGINT, istat);
- SIGNAL (SIGQUIT, qstat);
+ SIGNAL(SIGINT, istat);
+ SIGNAL(SIGQUIT, qstat);
}
}
-#ifdef HAVE_UNION_WAIT
- return (pid == -1 ? -1 : status.w_status);
-#else
return (pid == -1 ? -1 : status);
return (pid == -1 ? -1 : status);
-#endif
}
}