Merge remote-tracking branch 'toybox/master' into HEAD am: f353b240a5

[android-x86/external-toybox.git] / lib / help.c

diff --git a/lib/help.c b/lib/help.c
index b5d8f6b..d018567 100644 (file)
--- a/lib/help.c
+++ b/lib/help.c
@@ -2,37 +2,34 @@
 
 #include "toys.h"
 
-#if !CFG_TOYBOX_HELP
-void show_help(void) {;}
-#else
 #include "generated/help.h"
 
 #undef NEWTOY
 #undef OLDTOY
-#define NEWTOY(name,opt,flags) help_##name "\0"
+#define NEWTOY(name,opt,flags) HELP_##name "\0"
+#if CFG_TOYBOX
 #define OLDTOY(name,oldname,flags) "\xff" #oldname "\0"
+#else
+#define OLDTOY(name, oldname, flags) HELP_##oldname "\0"
+#endif
 static char *help_data =
 #include "generated/newtoys.h"
 ;
 
-void show_help(void)
+void show_help(FILE *out)
 {
   int i = toys.which-toy_list;
   char *s;
 
-  for (;;) {
-    s = help_data;
-    while (i--) s += strlen(s) + 1;
-    // If it's an alias, restart search for real name
-    if (*s != 255) break;
-    if (!CFG_TOYBOX) {
-      s = xmprintf("See %s --help\n", ++s);
-
-      break;
+  if (CFG_TOYBOX_HELP) {
+    for (;;) {
+      s = help_data;
+      while (i--) s += strlen(s) + 1;
+      // If it's an alias, restart search for real name
+      if (*s != 255) break;
+      i = toy_find(++s)-toy_list;
     }
-    i = toy_find(++s)-toy_list;
-  }
 
-  fprintf(toys.exithelp ? stderr : stdout, "%s", s);
+    fprintf(out, "%s", s);
+  }
 }
-#endif