diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-01-02 19:55:04 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-01-02 19:55:04 +0000 |
| commit | fb0eba706cccd510d99c4c5339a76dd15bc8a628 (patch) | |
| tree | 45122b93a1a5d628e4aa146251e34397094de817 /networking/ifupdown.c | |
| parent | 27963980dbe1262fd6c447fc7d06839aea0861bc (diff) | |
| download | busybox-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 'networking/ifupdown.c')
| -rw-r--r-- | networking/ifupdown.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 31911cd21..68ea01a67 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
| @@ -944,7 +944,7 @@ static int doit(char *str) | |||
| 944 | execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, NULL, my_environ); | 944 | execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, NULL, my_environ); |
| 945 | exit(127); | 945 | exit(127); |
| 946 | } | 946 | } |
| 947 | waitpid(child, &status, 0); | 947 | safe_waitpid(child, &status, 0); |
| 948 | if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { | 948 | if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { |
| 949 | return 0; | 949 | return 0; |
| 950 | } | 950 | } |
| @@ -1068,7 +1068,7 @@ static char *run_mapping(char *physical, struct mapping_defn_t * map) | |||
| 1068 | fprintf(in, "%s\n", map->mapping[i]); | 1068 | fprintf(in, "%s\n", map->mapping[i]); |
| 1069 | } | 1069 | } |
| 1070 | fclose(in); | 1070 | fclose(in); |
| 1071 | waitpid(pid, &status, 0); | 1071 | safe_waitpid(pid, &status, 0); |
| 1072 | 1072 | ||
| 1073 | if (WIFEXITED(status) && WEXITSTATUS(status) == 0) { | 1073 | if (WIFEXITED(status) && WEXITSTATUS(status) == 0) { |
| 1074 | /* If the mapping script exited successfully, try to | 1074 | /* If the mapping script exited successfully, try to |