diff options
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/setup_environment.c | 8 | ||||
| -rw-r--r-- | libbb/xfuncs_printf.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libbb/setup_environment.c b/libbb/setup_environment.c index 73229ca..4258656 100644 --- a/libbb/setup_environment.c +++ b/libbb/setup_environment.c @@ -37,9 +37,11 @@ void FAST_FUNC setup_environment(const char *shell, int flags, const struct pass /* Change the current working directory to be the home directory * of the user */ - if (chdir(pw->pw_dir)) { - xchdir((flags & SETUP_ENV_TO_TMP) ? "/tmp" : "/"); - bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir); + if (!(flags & SETUP_ENV_NO_CHDIR)) { + if (chdir(pw->pw_dir) != 0) { + bb_error_msg("can't change directory to '%s'", pw->pw_dir); + xchdir((flags & SETUP_ENV_TO_TMP) ? "/tmp" : "/"); + } } if (flags & SETUP_ENV_CLEARENV) { diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c index d8a42ba..05aa07c 100644 --- a/libbb/xfuncs_printf.c +++ b/libbb/xfuncs_printf.c @@ -355,13 +355,13 @@ void FAST_FUNC xsetuid(uid_t uid) void FAST_FUNC xchdir(const char *path) { if (chdir(path)) - bb_perror_msg_and_die("chdir(%s)", path); + bb_perror_msg_and_die("can't change directory to '%s'", path); } void FAST_FUNC xchroot(const char *path) { if (chroot(path)) - bb_perror_msg_and_die("can't change root directory to %s", path); + bb_perror_msg_and_die("can't change root directory to '%s'", path); xchdir("/"); } |