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 6a01be6034c749f1c989df60c91c200d0aaacd9f..b80a12ee013769c1ecc026aea3a185d6d674a61e 100644 (file)
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -2,66 +2,33 @@
 /*
  * Mini chroot implementation for busybox
  *
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#include "internal.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-
-
-static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n\n"
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-       "Run COMMAND with root directory set to NEWROOT.\n";
+#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) || (**(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);
+       ++argv;
+       if (!*argv)
+               bb_show_usage();
+       xchroot(*argv);
+       xchdir("/");
+
+       ++argv;
+       if (!*argv) { /* no 2nd param (PROG), use shell */
+               argv -= 2;
+               argv[0] = getenv("SHELL");
+               if (!argv[0]) {
+                       argv[0] = (char *) DEFAULT_SHELL;
+               }
+               argv[1] = (char *) "-i";
        }
 
-       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);
+       BB_EXECVP_or_die(argv);
 }