Static-ify a variable. make du work with all the human-readable variants

[oweals/busybox.git] / chroot.c

diff --git a/chroot.c b/chroot.c
index e8ce539732490eacb2a07a25ec1b2de6a78c0687..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,23 +22,24 @@
  *
  */
 
-#include "internal.h"
 #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);
+               show_usage();
        }
        argc--;
        argv++;
 
        if (chroot(*argv) || (chdir("/"))) {
-               fatalError("cannot change root directory to %s: %s\n", *argv, strerror(errno));
+               perror_msg_and_die("cannot change root directory to %s", *argv);
        }
 
        argc--;
@@ -54,10 +55,10 @@ int chroot_main(int argc, char **argv)
                execlp(prog, prog, NULL);
 #else
                shell_main(argc, argv);
-               exit (0);
+               return EXIT_SUCCESS;
 #endif
        }
-       fatalError("cannot execute %s: %s\n", prog, strerror(errno));
+       perror_msg_and_die("cannot execute %s", prog);
 
 }