diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-26 17:25:33 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-26 17:25:33 +0000 |
commit | afa7023b465d2abc5a85ecba0917cae974257eaf (patch) | |
tree | 8c8cc570f93e83a6a38f2b184d83cd7f2fa9985e /libbb/xfuncs.c | |
parent | 4e1361a4819ad0fcf76e161bfdcdc8bc29c872ff (diff) | |
download | busybox-w32-afa7023b465d2abc5a85ecba0917cae974257eaf.tar.gz busybox-w32-afa7023b465d2abc5a85ecba0917cae974257eaf.tar.bz2 busybox-w32-afa7023b465d2abc5a85ecba0917cae974257eaf.zip |
zcip: make it work on NOMMU (+ improve NOMMU support machinery)
fsck: fix bad English in a comment
Diffstat (limited to 'libbb/xfuncs.c')
-rw-r--r-- | libbb/xfuncs.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 14bd62a15..7f870ac8b 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c | |||
@@ -192,9 +192,16 @@ int wait4pid(int pid) | |||
192 | { | 192 | { |
193 | int status; | 193 | int status; |
194 | 194 | ||
195 | if (pid == -1 || waitpid(pid, &status, 0) == -1) return -1; | 195 | if (pid <= 0) { |
196 | if (WIFEXITED(status)) return WEXITSTATUS(status); | 196 | errno = ECHILD; |
197 | if (WIFSIGNALED(status)) return WTERMSIG(status); | 197 | return -1; |
198 | } | ||
199 | if (waitpid(pid, &status, 0) == -1) | ||
200 | return -1; | ||
201 | if (WIFEXITED(status)) | ||
202 | return WEXITSTATUS(status); | ||
203 | if (WIFSIGNALED(status)) | ||
204 | return WTERMSIG(status) + 10000; | ||
198 | return 0; | 205 | return 0; |
199 | } | 206 | } |
200 | 207 | ||