1 files changed, 4 insertions, 6 deletions

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 9b3d70044..f7228a61a 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -12,18 +12,16 @@
 #include "libbb.h"
 
 int chroot_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int chroot_main(int argc, char **argv)
+int chroot_main(int argc UNUSED_PARAM, char **argv)
 {
-        if (argc < 2) {
-                bb_show_usage();
-        }
-
         ++argv;
+        if (!*argv)
+                bb_show_usage();
         xchroot(*argv);
         xchdir("/");
 
         ++argv;
-        if (argc == 2) {
+        if (!*argv) { /* no 2nd param (PROG), use shell */
                 argv -= 2;
                 argv[0] = getenv("SHELL");
                 if (!argv[0]) {