diff options
| -rw-r--r-- | shell/ash.c | 4 | ||||
| -rw-r--r-- | shell/hush.c | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c index d2c937283..3fff88168 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -54,14 +54,14 @@ //config:config ASH_BASH_SOURCE_CURDIR //config: bool "'source' and '.' builtins search current directory after $PATH" //config: default n # do not encourage non-standard behavior -//config: depends ASH_BASH_COMPAT +//config: depends on ASH_BASH_COMPAT //config: help //config: This is not compliant with standards. Avoid if possible. //config: //config:config ASH_BASH_NOT_FOUND_HOOK //config: bool "command_not_found_handle hook support" //config: default y -//config: depends ASH_BASH_COMPAT +//config: depends on ASH_BASH_COMPAT //config: help //config: Enable support for the 'command_not_found_handle' hook function, //config: from GNU bash, which allows for alternative command not found diff --git a/shell/hush.c b/shell/hush.c index 2d1cc5ca6..ddf377355 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -120,6 +120,13 @@ //config: help //config: Enable {abc,def} extension. //config: +//config:config HUSH_BASH_SOURCE_CURDIR +//config: bool "'source' and '.' builtins search current directory after $PATH" +//config: default n # do not encourage non-standard behavior +//config: depends on HUSH_BASH_COMPAT +//config: help +//config: This is not compliant with standards. Avoid if possible. +//config: //config:config HUSH_INTERACTIVE //config: bool "Interactive mode" //config: default y @@ -10211,7 +10218,7 @@ static int FAST_FUNC builtin_source(char **argv) arg_path = find_in_path(filename); if (arg_path) filename = arg_path; - else /* add "if (!HUSH_BASH_SOURCE_CURDIR)" if users want bash-compat */ { + else if (!ENABLE_HUSH_BASH_SOURCE_CURDIR) { errno = ENOENT; bb_simple_perror_msg(filename); return EXIT_FAILURE; |