config: more tweaks

[oweals/busybox.git] / coreutils / chroot.c

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index ca0bfcf3fbc6c58a3506b5c2f36b8049f1273b83..78751df84c30ffb019b6a147453f1347904c1618 100644 (file)
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -1,32 +1,55 @@
-#include "internal.h"
-#include <stdio.h>
-#include <unistd.h>
+/* vi: set sw=4 ts=4: */
+/*
+ * Mini chroot implementation for busybox
+ *
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+//config:config CHROOT
+//config:      bool "chroot (3.7 kb)"
+//config:      default y
+//config:      help
+//config:      chroot is used to change the root directory and run a command.
+//config:      The default command is '/bin/sh'.
 
+//applet:IF_CHROOT(APPLET_NOEXEC(chroot, chroot, BB_DIR_USR_SBIN, BB_SUID_DROP, chroot))
 
-const char chroot_usage[] = "chroot directory [command]\n"
-  "Run a command with special root directory.\n";
+//kbuild:lib-$(CONFIG_CHROOT) += chroot.o
 
-extern int
-chroot_main (struct FileInfo *i, int argc, char **argv)
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
+
+//usage:#define chroot_trivial_usage
+//usage:       "NEWROOT [PROG ARGS]"
+//usage:#define chroot_full_usage "\n\n"
+//usage:       "Run PROG with root directory set to NEWROOT"
+//usage:
+//usage:#define chroot_example_usage
+//usage:       "$ ls -l /bin/ls\n"
+//usage:       "lrwxrwxrwx    1 root     root          12 Apr 13 00:46 /bin/ls -> /BusyBox\n"
+//usage:       "# mount /dev/hdc1 /mnt -t minix\n"
+//usage:       "# chroot /mnt\n"
+//usage:       "# ls -l /bin/ls\n"
+//usage:       "-rwxr-xr-x    1 root     root        40816 Feb  5 07:45 /bin/ls*\n"
+
+#include "libbb.h"
+
+int chroot_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int chroot_main(int argc UNUSED_PARAM, char **argv)
 {
-  char *prog;
-
-  if (chroot (argv[1]))
-    {
-      name_and_error ("cannot chroot to that directory");
-      return 1;
-    }
-  if (argc > 2)
-    {
-      execvp (argv[2], argv + 2);
-    }
-  else
-    {
-      prog = getenv ("SHELL");
-      if (!prog)
-       prog = "/bin/sh";
-      execlp (prog, prog, NULL);
-    }
-  name_and_error ("cannot exec");
-  return 1;
+       ++argv;
+       if (!*argv)
+               bb_show_usage();
+
+       xchroot(*argv);
+
+       ++argv;
+       if (!*argv) { /* no 2nd param (PROG), use shell */
+               argv -= 2;
+               argv[0] = (char *) get_shell_name();
+               argv[1] = (char *) "-i"; /* GNU coreutils 8.4 compat */
+               /*argv[2] = NULL; - already is */
+       }
+
+       BB_EXECVP_or_die(argv);
 }