More little stuff.

[oweals/busybox.git] / chroot.c

diff --git a/chroot.c b/chroot.c
index 16524d92eae2f2f53fde2c0343b7df05cbb24fc3..63fa4d14602caa6461c23b4b6a6e0885db4ca328 100644 (file)
--- a/chroot.c
+++ b/chroot.c
@@ -1,8 +1,9 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini chroot implementation for busybox
  *
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000 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
@@ -28,39 +29,48 @@
 
 
 static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n\n"
-"Run COMMAND with root directory set to NEWROOT.\n";
+
+       "Run COMMAND with root directory set to NEWROOT.\n";
 
 
 
 int chroot_main(int argc, char **argv)
 {
-    if ( (argc < 2) || (**(argv+1) == '-') ) {
-       usage( chroot_usage);
-    }
-    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:
+*/