X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fchroot.c;h=ba3e5f86434ca5dbdfc98c3180ec68ff135d47a6;hb=741f40b58edf3644c6bc8e6863ee9ad681b21562;hp=3b6fdae3b295f09f2ddc4bb951b02f39ef65b15a;hpb=2ce1edcf544ac675e6762c9861a6b918401ea716;p=oweals%2Fbusybox.git

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 3b6fdae3b..ba3e5f864 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -1,7 +1,9 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini chroot implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ * 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
@@ -19,47 +21,54 @@
  *
  */
 
-#include "internal.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <errno.h>
-
-
-static const char chroot_usage[] = "NEWROOT [COMMAND...]\n"
-"Run COMMAND with root directory set to NEWROOT.\n";
-
-
+#include "busybox.h"
 
 int chroot_main(int argc, char **argv)
 {
-    if ( (argc < 2) || (**(argv+1) == '-') ) {
-	fprintf(stderr, "Usage: %s %s", *argv, chroot_usage);
-	exit( FALSE);
-    }
-    argc--;
-    argv++;
+	char *prog;
 
-    if (chroot (*argv) || (chdir ("/"))) {
-	fprintf(stderr, "chroot: cannot change root directory to %s: %s\n",
-		*argv, strerror(errno));
-	exit( FALSE);
-    }
+	if ((argc < 2) || (**(argv + 1) == '-')) {
+		show_usage();
+	}
+	argc--;
+	argv++;
+
+	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 {
+#if defined shell_main && defined CONFIG_FEATURE_SH_STANDALONE_SHELL
+		char shell[] = "/bin/sh";
+		char *shell_argv[2] = { shell, NULL };
+		applet_name = shell;
+		shell_main(1, shell_argv);
+		return EXIT_SUCCESS;
+#else
+		prog = getenv("SHELL");
+		if (!prog)
+			prog = "/bin/sh";
+		execlp(prog, prog, NULL);
+#endif
+	}
+	perror_msg_and_die("cannot execute %s", prog);
 
-    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);
-    }
-    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:
+*/