X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fchroot.c;h=3622c26dc7461360dafbed65bb18a193608883e9;hb=cbb0a4b40d32a653957d2c9ecb6fe1a70b30d907;hp=ca0bfcf3fbc6c58a3506b5c2f36b8049f1273b83;hpb=cc8ed39b240180b58810784f844e253263594ac3;p=oweals%2Fbusybox.git

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index ca0bfcf3f..3622c26dc 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -1,32 +1,76 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Mini chroot implementation for busybox
+ *
+ *
+ * Copyright (C) 1999 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 "internal.h"
+#include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <errno.h>
+
+
+static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n\n"
 
+	"Run COMMAND with root directory set to NEWROOT.\n";
 
-const char chroot_usage[] = "chroot directory [command]\n"
-  "Run a command with special root directory.\n";
 
-extern int
-chroot_main (struct FileInfo *i, int argc, char **argv)
+
+int chroot_main(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;
+	if ((argc < 2) || (**(argv + 1) == '-')) {
+		usage(chroot_usage);
+	}
+	argc--;
+	argv++;
+
+	if (chroot(*argv) || (chdir("/"))) {
+		fprintf(stderr, "chroot: cannot change root directory to %s: %s\n",
+				*argv, strerror(errno));
+		exit(FALSE);
+	}
+
+	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:
+*/