diff options
Diffstat (limited to 'release/src/router/busybox/coreutils/chroot.c')
| -rw-r--r-- | release/src/router/busybox/coreutils/chroot.c | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/release/src/router/busybox/coreutils/chroot.c b/release/src/router/busybox/coreutils/chroot.c index 5562e58c..1198a415 100644 --- a/release/src/router/busybox/coreutils/chroot.c +++ b/release/src/router/busybox/coreutils/chroot.c @@ -2,32 +2,16 @@ /* * Mini chroot implementation for busybox * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ -#include <stdlib.h> -#include <stdio.h> -#include <unistd.h> -#include <errno.h> -#include "busybox.h" +#include "libbb.h" +int chroot_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int chroot_main(int argc, char **argv) { if (argc < 2) { @@ -35,19 +19,19 @@ int chroot_main(int argc, char **argv) } ++argv; - if (chroot(*argv) || (chdir("/"))) { - bb_perror_msg_and_die("cannot change root directory to %s", *argv); - } + xchroot(*argv); + xchdir("/"); ++argv; if (argc == 2) { argv -= 2; - if (!(*argv = getenv("SHELL"))) { - *argv = (char *) "/bin/sh"; + argv[0] = getenv("SHELL"); + if (!argv[0]) { + argv[0] = (char *) DEFAULT_SHELL; } argv[1] = (char *) "-i"; } - execvp(*argv, argv); + BB_EXECVP(*argv, argv); bb_perror_msg_and_die("cannot execute %s", *argv); } |