diff options
| author | Pascal Bellard | 2010-07-04 15:32:38 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2010-07-04 15:32:38 +0200 |
| commit | 926031b7640bf5aad2ffcd54b096911743a47d97 (patch) | |
| tree | 093e0e1bab2c905a97c5880e4942e2000ada7e72 /libbb | |
| parent | 243d1757d798a0cd43f51eb1db75cc1e81c65732 (diff) | |
| download | busybox-926031b7640bf5aad2ffcd54b096911743a47d97.zip busybox-926031b7640bf5aad2ffcd54b096911743a47d97.tar.gz | |
*: introduce and use xfork() and xvfork()
function old new delta
launch_helper 170 169 -1
setup_heredoc 312 302 -10
handle_dir_common 367 354 -13
expand_vars_to_list 2456 2443 -13
open_transformer 89 74 -15
data_extract_to_command 439 423 -16
do_ipaddr 1406 1389 -17
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/7 up/down: 0/-85) Total: -85 bytes
Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/vfork_daemon_rexec.c | 16 | ||||
| -rw-r--r-- | libbb/xfuncs_printf.c | 11 |
2 files changed, 12 insertions, 15 deletions
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c index 8102ea2..5c2c529 100644 --- a/libbb/vfork_daemon_rexec.c +++ b/libbb/vfork_daemon_rexec.c @@ -224,26 +224,12 @@ pid_t FAST_FUNC fork_or_rexec(char **argv) /* Maybe we are already re-execed and come here again? */ if (re_execed) return 0; - pid = vfork(); - if (pid < 0) /* wtf? */ - bb_perror_msg_and_die("vfork"); + pid = xvfork(); if (pid) /* parent */ return pid; /* child - re-exec ourself */ re_exec(argv); } -#else -/* Dance around (void)...*/ -#undef fork_or_rexec -pid_t FAST_FUNC fork_or_rexec(void) -{ - pid_t pid; - pid = fork(); - if (pid < 0) /* wtf? */ - bb_perror_msg_and_die("fork"); - return pid; -} -#define fork_or_rexec(argv) fork_or_rexec() #endif /* Due to a #define in libbb.h on MMU systems we actually have 1 argument - diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c index f021493..7069a7c 100644 --- a/libbb/xfuncs_printf.c +++ b/libbb/xfuncs_printf.c @@ -589,3 +589,14 @@ void FAST_FUNC generate_uuid(uint8_t *buf) /* variant = 10x */ buf[4 + 2 + 2] = (buf[4 + 2 + 2] & 0x3f) | 0x80; } + +#if BB_MMU +pid_t FAST_FUNC xfork(void) +{ + pid_t pid; + pid = fork(); + if (pid < 0) /* wtf? */ + bb_perror_msg_and_die("vfork"+1); + return pid; +} +#endif |