Another update from Larry:

[oweals/busybox.git] / chroot.c

diff --git a/chroot.c b/chroot.c
index ca0bfcf3fbc6c58a3506b5c2f36b8049f1273b83..bae9cd75702288f662db639518f287bc2556ea30 100644 (file)
--- a/chroot.c
+++ b/chroot.c
@@ -1,32 +1,72 @@
-#include "internal.h"
+/* vi: set sw=4 ts=4: */
+/*
+ * Mini chroot implementation for busybox
+ *
+ *
+ * Copyright (C) 1999,2000,2001 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
+ *
+ */
+
+#include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <errno.h>
+#include "busybox.h"
+
+int chroot_main(int argc, char **argv)
+{
+       char *prog;
 
+       if ((argc < 2) || (**(argv + 1) == '-')) {
+               show_usage();
+       }
+       argc--;
+       argv++;
 
-const char chroot_usage[] = "chroot directory [command]\n"
-  "Run a command with special root directory.\n";
+       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
+       }
+       perror_msg_and_die("cannot execute %s", prog);
 
-extern int
-chroot_main (struct FileInfo *i, int argc, 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;
 }
+
+
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/