diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-23 12:12:03 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 12:12:03 +0000 |
| commit | b0f54743e36af163ae2530c381c485bb29df13dc (patch) | |
| tree | cda4cfeaae6e47fe4f14c1b566092be4da9affc4 /libbb/xfuncs_printf.c | |
| parent | 40514a0309939f2446f0d4ed9600cad5de396e7f (diff) | |
| parent | ba88826c66411affc1da3614742b454654f7298a (diff) | |
| download | busybox-w32-b0f54743e36af163ae2530c381c485bb29df13dc.tar.gz busybox-w32-b0f54743e36af163ae2530c381c485bb29df13dc.tar.bz2 busybox-w32-b0f54743e36af163ae2530c381c485bb29df13dc.zip | |
Merge branch 'busybox' into merge
Conflicts:
Makefile.flags
Diffstat (limited to 'libbb/xfuncs_printf.c')
| -rw-r--r-- | libbb/xfuncs_printf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c index 8a6d7e1d1..70d3fc96c 100644 --- a/libbb/xfuncs_printf.c +++ b/libbb/xfuncs_printf.c | |||
| @@ -376,6 +376,7 @@ void FAST_FUNC xchroot(const char *path) | |||
| 376 | { | 376 | { |
| 377 | if (chroot(path)) | 377 | if (chroot(path)) |
| 378 | bb_perror_msg_and_die("can't change root directory to %s", path); | 378 | bb_perror_msg_and_die("can't change root directory to %s", path); |
| 379 | xchdir("/"); | ||
| 379 | } | 380 | } |
| 380 | 381 | ||
| 381 | // Print a warning message if opendir() fails, but don't die. | 382 | // Print a warning message if opendir() fails, but don't die. |