From 0ed071907c1a1e7bab8c0e808a053b907b20783c Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Tue, 7 Jul 2020 17:02:58 +0100 Subject: ash: fix shell options The Windows-specific shell options winxp, noconsole and nocaseglob have had the wrong indices in optlist since the merge with upstream BusyBox in commit 517cf74f6. --- shell/ash.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'shell') diff --git a/shell/ash.c b/shell/ash.c index 397995d9a..8a6097211 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -565,13 +565,13 @@ struct globals_misc { # define debug optlist[16 + BASH_PIPEFAIL] #endif #if ENABLE_PLATFORM_MINGW32 -# define winxp optlist[14 + BASH_PIPEFAIL + 2*DEBUG] -#endif -#if ENABLE_ASH_NOCONSOLE -# define noconsole optlist[15 + BASH_PIPEFAIL + 2*DEBUG] -#endif -#if ENABLE_ASH_NOCASEGLOB -# define nocaseglob optlist[15 + BASH_PIPEFAIL + 2*DEBUG + ENABLE_ASH_NOCONSOLE] +# define winxp optlist[15 + BASH_PIPEFAIL + 2*DEBUG] +# if ENABLE_ASH_NOCONSOLE +# define noconsole optlist[16 + BASH_PIPEFAIL + 2*DEBUG] +# endif +# if ENABLE_ASH_NOCASEGLOB +# define nocaseglob optlist[16 + BASH_PIPEFAIL + 2*DEBUG+ENABLE_ASH_NOCONSOLE] +# endif #endif /* trap handler commands */ -- cgit v1.2.3-55-g6feb