Patch from Shaun Jackman to save a few bytes.

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

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 16524d92eae2f2f53fde2c0343b7df05cbb24fc3..62257021d303a5a9898fa7d708b4e85ad2560f67 100644 (file)
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -1,9 +1,8 @@
+/* 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>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.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
@@ -21,46 +20,34 @@
  *
  */
 
-#include "internal.h"
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
+
 #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";
-
-
+#include "busybox.h"
 
 int chroot_main(int argc, char **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);
-    }
-
-    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);
+       if (argc < 2) {
+               bb_show_usage();
+       }
+
+       ++argv;
+       if (chroot(*argv) || (chdir("/"))) {
+               bb_perror_msg_and_die("cannot change root directory to %s", *argv);
+       }
+
+       ++argv;
+       if (argc == 2) {
+               argv -= 2;
+               if (!(*argv = getenv("SHELL"))) {
+                       *argv = (char *) DEFAULT_SHELL;
+               }
+               argv[1] = (char *) "-i";
+       }
+
+       execvp(*argv, argv);
+       bb_perror_msg_and_die("cannot execute %s", *argv);
 }
-