X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fchroot.c;h=f7228a61ae4ef904d86a30e1aa63b58b35d6089b;hb=1abc07dcca237e6b5c98fea740e59d59c801c9e2;hp=e6f1d034bc5db9aa11bf72758508b551a1f3136f;hpb=ed3ef50c233ffb1b50ea0e7382a8e60b86491009;p=oweals%2Fbusybox.git

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index e6f1d034b..f7228a61a 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -2,71 +2,34 @@
 /*
  * Mini chroot implementation for busybox
  *
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <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
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-int chroot_main(int argc, char **argv)
-{
-	char *prog;
-
-	if ((argc < 2) || (**(argv + 1) == '-')) {
-		usage(chroot_usage);
-	}
-	argc--;
-	argv++;
+#include "libbb.h"
 
-	if (chroot(*argv) || (chdir("/"))) {
-		perror_msg_and_die("cannot change root directory to %s", *argv);
-	}
-
-	argc--;
-	argv++;
-	if (argc >= 1) {
-		prog = *argv;
-		execvp(*argv, argv);
-	} else {
-#ifndef BB_SH
-		prog = getenv("SHELL");
-		if (!prog)
-			prog = "/bin/sh";
-		execlp(prog, prog, NULL);
-#else
-		shell_main(argc, argv);
-		return EXIT_SUCCESS;
-#endif
+int chroot_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int chroot_main(int argc UNUSED_PARAM, char **argv)
+{
+	++argv;
+	if (!*argv)
+		bb_show_usage();
+	xchroot(*argv);
+	xchdir("/");
+
+	++argv;
+	if (!*argv) { /* no 2nd param (PROG), use shell */
+		argv -= 2;
+		argv[0] = getenv("SHELL");
+		if (!argv[0]) {
+			argv[0] = (char *) DEFAULT_SHELL;
+		}
+		argv[1] = (char *) "-i";
 	}
-	perror_msg_and_die("cannot execute %s", prog);
 
+	BB_EXECVP(*argv, argv);
+	bb_perror_msg_and_die("can't execute '%s'", *argv);
 }
-
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/