ls: make --color more compatible with coreutils

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

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 91d3407f2a37f6a5ee7e0470d68880af3be667da..9b3d700444cd47749142029b0d5ad298b518e376 100644 (file)
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -2,70 +2,36 @@
 /*
  * Mini chroot implementation for busybox
  *
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * 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
- * 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 tarball for details.
  */
 
-#include "busybox.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
+
+#include "libbb.h"
 
+int chroot_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 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++;
 
-       if (chroot(*argv) || (chdir("/"))) {
-               perror_msg_and_die("cannot change root directory to %s", *argv);
+       ++argv;
+       xchroot(*argv);
+       xchdir("/");
+
+       ++argv;
+       if (argc == 2) {
+               argv -= 2;
+               argv[0] = getenv("SHELL");
+               if (!argv[0]) {
+                       argv[0] = (char *) DEFAULT_SHELL;
+               }
+               argv[1] = (char *) "-i";
        }
 
-       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
-       }
-       perror_msg_and_die("cannot execute %s", prog);
-
+       BB_EXECVP(*argv, argv);
+       bb_perror_msg_and_die("can't execute '%s'", *argv);
 }
-
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/