Applied patch from Vladimir Oleynik via Magnus Damm that removes newlines from

[oweals/busybox.git] / chroot.c

diff --git a/chroot.c b/chroot.c
index 1c64e08a94b14401a637b313688ba043807d83df..bae9cd75702288f662db639518f287bc2556ea30 100644 (file)
--- a/chroot.c
+++ b/chroot.c
@@ -3,7 +3,7 @@
  * Mini chroot implementation for busybox
  *
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 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
@@ -22,33 +22,24 @@
  *
  */
 
-#include "internal.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <errno.h>
-
-
-static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nRun COMMAND with root directory set to NEWROOT.\n"
-#endif
-       ;
-
-
+#include "busybox.h"
 
 int chroot_main(int argc, char **argv)
 {
        char *prog;
 
        if ((argc < 2) || (**(argv + 1) == '-')) {
-               usage(chroot_usage);
+               show_usage();
        }
        argc--;
        argv++;
 
        if (chroot(*argv) || (chdir("/"))) {
-               fatalError("chroot: cannot change root directory to %s: %s\n", 
-                               *argv, strerror(errno));
+               perror_msg_and_die("cannot change root directory to %s", *argv);
        }
 
        argc--;
@@ -57,13 +48,17 @@ int chroot_main(int argc, char **argv)
                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
        }
-       fatalError("chroot: cannot execute %s: %s\n", 
-                       prog, strerror(errno));
+       perror_msg_and_die("cannot execute %s", prog);
 
 }