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

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 3b6fdae3b..3622c26dc 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -1,7 +1,10 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini chroot implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * 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
@@ -25,41 +28,49 @@
 #include <errno.h>
 
 
-static const char chroot_usage[] = "NEWROOT [COMMAND...]\n"
-"Run COMMAND with root directory set to NEWROOT.\n";
+static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n\n"
+
+	"Run COMMAND with root directory set to NEWROOT.\n";
 
 
 
 int chroot_main(int argc, char **argv)
 {
-    if ( (argc < 2) || (**(argv+1) == '-') ) {
-	fprintf(stderr, "Usage: %s %s", *argv, chroot_usage);
-	exit( FALSE);
-    }
-    argc--;
-    argv++;
+	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);
+	}
 
-    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;
 
-    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);
+		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:
+*/