From 83d5d7a0bbf60f5d08a1e145058758e717f3a03a Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Thu, 31 Mar 2022 16:08:56 -0500
Subject: [PATCH] Fix "toybox command --help".

---
 main.c          | 5 +++--
 scripts/make.sh | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index b020a42dc..010efc010 100644
--- a/main.c
+++ b/main.c
@@ -114,8 +114,9 @@ static void unknown(char *name)
 // Parse --help and --version for (almost) all commands
 void check_help(char **arg)
 {
-  if (!CFG_TOYBOX_HELP_DASHDASH || !*arg || (toys.which->flags&TOYFLAG_NOHELP))
-    return;
+  if (!CFG_TOYBOX_HELP_DASHDASH || !*arg) return;
+  if (!CFG_TOYBOX || toys.which != toy_list)
+    if (toys.which->flags&TOYFLAG_NOHELP) return;
 
   if (!strcmp(*arg, "--help")) {
     if (CFG_TOYBOX && toys.which == toy_list && arg[1])
diff --git a/scripts/make.sh b/scripts/make.sh
index e3e4f624d..d850cd61e 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -43,7 +43,8 @@ if isnewer "$GENDIR"/newtoys.h toys
 then
   echo -n "$GENDIR/newtoys.h "
 
-  echo "USE_TOYBOX(NEWTOY(toybox, NULL, TOYFLAG_STAYROOT))" > "$GENDIR"/newtoys.h
+  echo "USE_TOYBOX(NEWTOY(toybox, NULL, TOYFLAG_STAYROOT|TOYFLAG_NOHELP))" \
+    > "$GENDIR"/newtoys.h
   $SED -n -e 's/^USE_[A-Z0-9_]*(/&/p' toys/*/*.c \
 	| $SED 's/\(.*TOY(\)\([^,]*\),\(.*\)/\2 \1\2,\3/' | sort -s -k 1,1 \
 	| $SED 's/[^ ]* //'  >> "$GENDIR"/newtoys.h