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 f279af18d96b2ea226e783a35235cbbfa889cdc2..62257021d303a5a9898fa7d708b4e85ad2560f67 100644 (file)
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -2,9 +2,7 @@
 /*
  * Mini chroot implementation for busybox
  *
- *
- * Copyright (C) 1999,2000 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
@@ -22,50 +20,34 @@
  *
  */
 
-#include "busybox.h"
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
+
 #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) == '-')) {
-               usage(chroot_usage);
+       if (argc < 2) {
+               bb_show_usage();
        }
-       argc--;
-       argv++;
 
+       ++argv;
        if (chroot(*argv) || (chdir("/"))) {
-               fatalError("cannot change root directory to %s: %s\n", *argv, strerror(errno));
+               bb_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
+       ++argv;
+       if (argc == 2) {
+               argv -= 2;
+               if (!(*argv = getenv("SHELL"))) {
+                       *argv = (char *) DEFAULT_SHELL;
+               }
+               argv[1] = (char *) "-i";
        }
-       fatalError("cannot execute %s: %s\n", prog, strerror(errno));
 
+       execvp(*argv, argv);
+       bb_perror_msg_and_die("cannot execute %s", *argv);
 }
-
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/