diff options
author | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-03-06 16:54:09 +0100 |
---|---|---|
committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-03-11 14:27:25 +0100 |
commit | dc6cfb7cebc64cdb278f02d32f897819bba5f983 (patch) | |
tree | 04cb1d5a44a1da6d2420fbfe2eaf6a5c0c728cb8 /main/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch | |
parent | 4923b942bfc1889d3b2f3f6cb20b2aeef6a65f06 (diff) | |
download | aports-dc6cfb7cebc64cdb278f02d32f897819bba5f983.tar.bz2 aports-dc6cfb7cebc64cdb278f02d32f897819bba5f983.tar.xz |
main/busybox: upgrade to 1.28.1
Diffstat (limited to 'main/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch')
-rw-r--r-- | main/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/main/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch b/main/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch new file mode 100644 index 0000000000..9fc6f7e681 --- /dev/null +++ b/main/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch @@ -0,0 +1,47 @@ +From 13c7e0cc7767b84e183ddbc3400171874478bf06 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko <vda.linux@googlemail.com> +Date: Fri, 26 Jan 2018 15:15:43 +0100 +Subject: [PATCH 15/16] ash: introduce a config option to search current + directory for sourced files + +--- + shell/ash.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/shell/ash.c b/shell/ash.c +index d04096a9b..5dd184360 100644 +--- a/shell/ash.c ++++ b/shell/ash.c +@@ -132,6 +132,13 @@ + //config: you to run the specified command or builtin, + //config: even when there is a function with the same name. + //config: ++//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: help ++//config: This is not compliant with standards. Avoid if possible. ++//config: + //config:config ASH_COMMAND_NOT_FOUND_HOOK + //config: bool "command_not_found_handle hook support" + //config: default y +@@ -12919,10 +12926,14 @@ find_dot_file(char *name) + if (fullname != name) + stunalloc(fullname); + } ++ /* not found in PATH */ + +- /* not found in the PATH */ ++#if ENABLE_ASH_BASH_SOURCE_CURDIR ++ return name; ++#else + ash_msg_and_raise_error("%s: not found", name); + /* NOTREACHED */ ++#endif + } + + static int FAST_FUNC +-- +2.16.2 + |