Change xgetpwnamid/xgetgrnamid to xgetuid/xgetgid returning the id number

[android-x86/external-toybox.git] / main.c

diff --git a/main.c b/main.c
index 31e51b1..c0c1b82 100644 (file)
--- a/main.c
+++ b/main.c
@@ -75,7 +75,9 @@ static void toy_singleinit(struct toy_list *which, char *argv[])
 
   if (CFG_TOYBOX_I18N) setlocale(LC_ALL, "C"+!!(which->flags & TOYFLAG_LOCALE));
 
-  if (CFG_TOYBOX_HELP_DASHDASH && argv[1] && !strcmp(argv[1], "--help")) {
+  if (CFG_TOYBOX_HELP_DASHDASH && !(which->flags & TOYFLAG_NOHELP)
+    && argv[1] && !strcmp(argv[1], "--help"))
+  {
     if (CFG_TOYBOX && toys.which == toy_list && toys.argv[2])
       if (!(toys.which = toy_find(toys.argv[2]))) return;
     show_help(stdout);