X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fchroot.c;h=62257021d303a5a9898fa7d708b4e85ad2560f67;hb=47bc802e9e8942182cd3cec1b5a6c3fb62427d16;hp=34116a60eb9d2eac4d2dd0399f72f9e0c42f3688;hpb=1d1d95051a288b6bf64498aac9fb20047f384b7d;p=oweals%2Fbusybox.git

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 34116a60e..62257021d 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -2,9 +2,7 @@
 /*
  * Mini chroot implementation for busybox
  *
- *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999-2004 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
@@ -22,57 +20,34 @@
  *
  */
 
-#include "internal.h"
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
+
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <errno.h>
-
-
-static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nRun COMMAND with root directory set to NEWROOT.\n"
-#endif
-	;
-
-
+#include "busybox.h"
 
 int chroot_main(int argc, char **argv)
 {
-	if ((argc < 2) || (**(argv + 1) == '-')) {
-		usage(chroot_usage);
+	if (argc < 2) {
+		bb_show_usage();
 	}
-	argc--;
-	argv++;
 
+	++argv;
 	if (chroot(*argv) || (chdir("/"))) {
-		fprintf(stderr, "chroot: cannot change root directory to %s: %s\n",
-				*argv, strerror(errno));
-		exit(FALSE);
+		bb_perror_msg_and_die("cannot change root directory to %s", *argv);
 	}
 
-	argc--;
-	argv++;
-	if (argc >= 1) {
-		fprintf(stderr, "command: %s\n", *argv);
-		execvp(*argv, argv);
-	} else {
-		char *prog;
-
-		prog = getenv("SHELL");
-		if (!prog)
-			prog = "/bin/sh";
-		execlp(prog, prog, NULL);
+	++argv;
+	if (argc == 2) {
+		argv -= 2;
+		if (!(*argv = getenv("SHELL"))) {
+			*argv = (char *) DEFAULT_SHELL;
+		}
+		argv[1] = (char *) "-i";
 	}
-	fprintf(stderr, "chroot: cannot execute %s: %s\n",
-			*argv, strerror(errno));
-	exit(FALSE);
-}
-
 
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+	execvp(*argv, argv);
+	bb_perror_msg_and_die("cannot execute %s", *argv);
+}