aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-01-02 19:55:04 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-01-02 19:55:04 +0000
commitfb0eba706cccd510d99c4c5339a76dd15bc8a628 (patch)
tree45122b93a1a5d628e4aa146251e34397094de817 /shell
parent27963980dbe1262fd6c447fc7d06839aea0861bc (diff)
downloadbusybox-w32-fb0eba706cccd510d99c4c5339a76dd15bc8a628.tar.gz
busybox-w32-fb0eba706cccd510d99c4c5339a76dd15bc8a628.tar.bz2
busybox-w32-fb0eba706cccd510d99c4c5339a76dd15bc8a628.zip
libbb: introduce and use safe_waitpid (loops in EINTR)
*: use more approproate (shorter) versions of wait() function old new delta safe_waitpid - 48 +48 wait_any_nohang - 17 +17 send_tree 365 369 +4 processorstop 432 435 +3 text_yank 110 108 -2 make_human_readable_str 202 200 -2 crond_main 1368 1366 -2 handle_sigchld 49 43 -6 reapchild 166 159 -7 custom 260 250 -10 checkscript 191 177 -14 wait_nohang 17 - -17 wait_pid 43 - -43 ------------------------------------------------------------------------------ (add/remove: 2/2 grow/shrink: 2/7 up/down: 72/-103) Total: -31 bytes
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c2
-rw-r--r--shell/hush.c1
-rw-r--r--shell/msh.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c
index a5b19c863..96563bf06 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3768,7 +3768,7 @@ waitproc(int block, int *status)
3768#endif 3768#endif
3769 if (block == 0) 3769 if (block == 0)
3770 flags |= WNOHANG; 3770 flags |= WNOHANG;
3771 return wait3(status, flags, (struct rusage *)NULL); 3771 return waitpid(-1, status, flags); // safe_waitpid?
3772} 3772}
3773 3773
3774/* 3774/*
diff --git a/shell/hush.c b/shell/hush.c
index cb2c3e98e..b08fe10b6 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1649,6 +1649,7 @@ static int checkjobs(struct pipe* fg_pipe)
1649// + killall -STOP cat 1649// + killall -STOP cat
1650 1650
1651 wait_more: 1651 wait_more:
1652// TODO: safe_waitpid?
1652 while ((childpid = waitpid(-1, &status, attributes)) > 0) { 1653 while ((childpid = waitpid(-1, &status, attributes)) > 0) {
1653 const int dead = WIFEXITED(status) || WIFSIGNALED(status); 1654 const int dead = WIFEXITED(status) || WIFSIGNALED(status);
1654 1655
diff --git a/shell/msh.c b/shell/msh.c
index 9edf793ab..9e9b798a1 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -4162,7 +4162,7 @@ static int grave(int quoted)
4162 return 0; 4162 return 0;
4163 } 4163 }
4164 if (i != 0) { 4164 if (i != 0) {
4165 waitpid(i, NULL, 0); 4165 waitpid(i, NULL, 0); // safe_waitpid?
4166 global_env.iop->argp->aword = ++cp; 4166 global_env.iop->argp->aword = ++cp;
4167 close(pf[1]); 4167 close(pf[1]);
4168 PUSHIO(afile, remap(pf[0]), 4168 PUSHIO(afile, remap(pf[0]),