This is a fix for chroot

- Fixed error message when the command is not specified (possibly crash on
libc5 systems!)
- Debugging output removed
- Using fatalError() whenever appropriate

Regards,
Pavel Roskin

diff --git a/chroot.c b/chroot.c
index 34116a60eb9d2eac4d2dd0399f72f9e0c42f3688..1c64e08a94b14401a637b313688ba043807d83df 100644 (file)
--- a/chroot.c
+++ b/chroot.c
@@ -38,6 +38,8 @@ static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n"
 
 int chroot_main(int argc, char **argv)
 {
+       char *prog;
+
        if ((argc < 2) || (**(argv + 1) == '-')) {
                usage(chroot_usage);
        }
@@ -45,27 +47,24 @@ int chroot_main(int argc, char **argv)
        argv++;
 
        if (chroot(*argv) || (chdir("/"))) {
-               fprintf(stderr, "chroot: cannot change root directory to %s: %s\n",
+               fatalError("chroot: cannot change root directory to %s: %s\n", 
                                *argv, strerror(errno));
-               exit(FALSE);
        }
 
        argc--;
        argv++;
        if (argc >= 1) {
-               fprintf(stderr, "command: %s\n", *argv);
+               prog = *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);
+       fatalError("chroot: cannot execute %s: %s\n", 
+                       prog, strerror(errno));
+
 }
 
 

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 34116a60eb9d2eac4d2dd0399f72f9e0c42f3688..1c64e08a94b14401a637b313688ba043807d83df 100644 (file)
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -38,6 +38,8 @@ static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n"
 
 int chroot_main(int argc, char **argv)
 {
+       char *prog;
+
        if ((argc < 2) || (**(argv + 1) == '-')) {
                usage(chroot_usage);
        }
@@ -45,27 +47,24 @@ int chroot_main(int argc, char **argv)
        argv++;
 
        if (chroot(*argv) || (chdir("/"))) {
-               fprintf(stderr, "chroot: cannot change root directory to %s: %s\n",
+               fatalError("chroot: cannot change root directory to %s: %s\n", 
                                *argv, strerror(errno));
-               exit(FALSE);
        }
 
        argc--;
        argv++;
        if (argc >= 1) {
-               fprintf(stderr, "command: %s\n", *argv);
+               prog = *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);
+       fatalError("chroot: cannot execute %s: %s\n", 
+                       prog, strerror(errno));
+
 }