diff options
| author | Ron Yorston <rmy@pobox.com> | 2020-07-07 17:02:58 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2020-07-07 17:02:58 +0100 |
| commit | 0ed071907c1a1e7bab8c0e808a053b907b20783c (patch) | |
| tree | e3315721342e031be0fffdef09f8297a21b2ffb2 /shell | |
| parent | 90b695c255eeeddb2bb90e5cacbd3253663bfa7f (diff) | |
| download | busybox-w32-0ed071907c1a1e7bab8c0e808a053b907b20783c.tar.gz busybox-w32-0ed071907c1a1e7bab8c0e808a053b907b20783c.tar.bz2 busybox-w32-0ed071907c1a1e7bab8c0e808a053b907b20783c.zip | |
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.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 14 |
1 files changed, 7 insertions, 7 deletions
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 { | |||
| 565 | # define debug optlist[16 + BASH_PIPEFAIL] | 565 | # define debug optlist[16 + BASH_PIPEFAIL] |
| 566 | #endif | 566 | #endif |
| 567 | #if ENABLE_PLATFORM_MINGW32 | 567 | #if ENABLE_PLATFORM_MINGW32 |
| 568 | # define winxp optlist[14 + BASH_PIPEFAIL + 2*DEBUG] | 568 | # define winxp optlist[15 + BASH_PIPEFAIL + 2*DEBUG] |
| 569 | #endif | 569 | # if ENABLE_ASH_NOCONSOLE |
| 570 | #if ENABLE_ASH_NOCONSOLE | 570 | # define noconsole optlist[16 + BASH_PIPEFAIL + 2*DEBUG] |
| 571 | # define noconsole optlist[15 + BASH_PIPEFAIL + 2*DEBUG] | 571 | # endif |
| 572 | #endif | 572 | # if ENABLE_ASH_NOCASEGLOB |
| 573 | #if ENABLE_ASH_NOCASEGLOB | 573 | # define nocaseglob optlist[16 + BASH_PIPEFAIL + 2*DEBUG+ENABLE_ASH_NOCONSOLE] |
| 574 | # define nocaseglob optlist[15 + BASH_PIPEFAIL + 2*DEBUG + ENABLE_ASH_NOCONSOLE] | 574 | # endif |
| 575 | #endif | 575 | #endif |
| 576 | 576 | ||
| 577 | /* trap handler commands */ | 577 | /* trap handler commands */ |