Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/chroot.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/chroot.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/coreutils/chroot.c

@@ -10 +10 @@
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include "busybox.h"
+#include "libbb.h"
 
+int chroot_main(int argc, char **argv);
 int chroot_main(int argc, char **argv)
 {
@@ -26 +23 @@
         bb_perror_msg_and_die("cannot change root directory to %s", *argv);
     }
-    bb_xchdir("/");
+    xchdir("/");
 
     ++argv;
     if (argc == 2) {
         argv -= 2;
-        if (!(*argv = getenv("SHELL"))) {
-            *argv = (char *) DEFAULT_SHELL;
+        argv[0] = getenv("SHELL");
+        if (!argv[0]) {
+            argv[0] = (char *) DEFAULT_SHELL;
         }
         argv[1] = (char *) "-i";
     }
 
-    execvp(*argv, argv);
+    BB_EXECVP(*argv, argv);
     bb_perror_msg_and_die("cannot execute %s", *argv);
 }