lineedit: do not hang on error, but return error indicator.

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

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 62cfdc244cb71d00248f5a73786c2f7f92f17763..b80a12ee013769c1ecc026aea3a185d6d674a61e 100644 (file)
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -4,34 +4,31 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include "busybox.h"
+#include "libbb.h"
 
-int chroot_main(int argc, char **argv)
+int chroot_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int chroot_main(int argc UNUSED_PARAM, char **argv)
 {
-       if (argc < 2) {
-               bb_show_usage();
-       }
-
        ++argv;
-       if (chroot(*argv)) {
-               bb_perror_msg_and_die("cannot change root directory to %s", *argv);
-       }
+       if (!*argv)
+               bb_show_usage();
+       xchroot(*argv);
        xchdir("/");
 
        ++argv;
-       if (argc == 2) {
+       if (!*argv) { /* no 2nd param (PROG), use shell */
                argv -= 2;
-               if (!(*argv = getenv("SHELL"))) {
-                       *argv = (char *) DEFAULT_SHELL;
+               argv[0] = getenv("SHELL");
+               if (!argv[0]) {
+                       argv[0] = (char *) DEFAULT_SHELL;
                }
                argv[1] = (char *) "-i";
        }
 
-       execvp(*argv, argv);
-       bb_perror_msg_and_die("cannot execute %s", *argv);
+       BB_EXECVP_or_die(argv);
 }