diff options
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/xfuncs.c | 12 | ||||
| -rw-r--r-- | libbb/xfuncs_printf.c | 18 |
2 files changed, 18 insertions, 12 deletions
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index ee2dbdef1..d93d8aaf5 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -417,15 +417,3 @@ int FAST_FUNC wait4pid(pid_t pid) return WTERMSIG(status) + 0x180; return 0; } - -// Useful when we do know that pid is valid, and we just want to wait -// for it to exit. Not existing pid is fatal. waitpid() status is not returned. -int FAST_FUNC wait_for_exitstatus(pid_t pid) -{ - int exit_status, n; - - n = safe_waitpid(pid, &exit_status, 0); - if (n < 0) - bb_simple_perror_msg_and_die("waitpid"); - return exit_status; -} diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c index db40e996b..6c220434d 100644 --- a/libbb/xfuncs_printf.c +++ b/libbb/xfuncs_printf.c @@ -702,3 +702,21 @@ void FAST_FUNC xvfork_parent_waits_and_exits(void) } /* Child continues */ } + +// Useful when we do know that pid is valid, and we just want to wait +// for it to exit. Not existing pid is fatal. waitpid() status is not returned. +int FAST_FUNC wait_for_exitstatus(pid_t pid) +{ + int exit_status, n; + + n = safe_waitpid(pid, &exit_status, 0); + if (n < 0) + bb_simple_perror_msg_and_die("waitpid"); + return exit_status; +} + +void FAST_FUNC xsettimeofday(const struct timeval *tv) +{ + if (settimeofday(tv, NULL)) + bb_simple_perror_msg_and_die("settimeofday"); +} |