X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fchroot.c;h=fcd70f21a8bcfe9e07f3f449c592cde17ba96527;hb=ec1a4b5a521b5adf295bc757c25231910f8c854b;hp=01e4d564c834620c22c93289296cfd893d1350b4;hpb=cad5364599eb5062d59e0c397ed638ddd61a8d5d;p=oweals%2Fbusybox.git

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 01e4d564c..fcd70f21a 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -2,33 +2,16 @@
 /*
  * Mini chroot implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.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"
 
+int chroot_main(int argc, char **argv);
 int chroot_main(int argc, char **argv)
 {
 	if (argc < 2) {
@@ -36,19 +19,20 @@ int chroot_main(int argc, char **argv)
 	}
 
 	++argv;
-	if (chroot(*argv) || (chdir("/"))) {
+	if (chroot(*argv)) {
 		bb_perror_msg_and_die("cannot change root directory to %s", *argv);
 	}
+	xchdir("/");
 
 	++argv;
 	if (argc == 2) {
 		argv -= 2;
 		if (!(*argv = getenv("SHELL"))) {
-			*argv = (char *) "/bin/sh";
+			*argv = (char *) DEFAULT_SHELL;
 		}
 		argv[1] = (char *) "-i";
 	}
 
-	execvp(*argv, argv);
+	BB_EXECVP(*argv, argv);
 	bb_perror_msg_and_die("cannot execute %s", *argv);
 }