From 440328edfcf65f29b69f9069517b7192e026c187 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 3 Jan 2020 03:31:55 -0600 Subject: No, optflags gets cleared by toy_init(), use toys.rebound instead. --- lib/lib.h | 1 - toys/other/help.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/lib.h b/lib/lib.h index 398d261d..9e933401 100644 --- a/lib/lib.h +++ b/lib/lib.h @@ -55,7 +55,6 @@ struct num_cache *add_num_cache(struct num_cache **cache, long long num, // args.c #define FLAGS_NODASH (1LL<<63) -#define FLAGS_BUILTIN (1LL<<62) void get_optflags(void); // dirtree.c diff --git a/toys/other/help.c b/toys/other/help.c index eba3cb1e..3ac4f128 100644 --- a/toys/other/help.c +++ b/toys/other/help.c @@ -51,7 +51,7 @@ void help_main(void) int i; // If called with no arguments as a builtin form the shell, show all builtins - if (!*toys.optargs && (toys.optflags&FLAGS_BUILTIN)) { + if (!*toys.optargs && toys.rebound) { for (i = 0; i < toys.toycount; i++) { if (!(toy_list[i].flags&(TOYFLAG_NOFORK|TOYFLAG_MAYFORK))) continue; toys.which = toy_list+i; -- cgit v1.2.3