diff options
| author | Ron Yorston | 2015-05-18 09:53:26 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2015-05-18 09:53:26 +0200 |
| commit | 3df47f9cbbb7f16608cbc642026625cdf7f06aa9 (patch) | |
| tree | a2bc999e17bcf10c29bceeb1403cbc7ef658aa84 /shell/ash_test | |
| parent | eb6b48ba743d510ad9e6f9c3a8b3899d1eb9b5f3 (diff) | |
| download | busybox-3df47f9cbbb7f16608cbc642026625cdf7f06aa9.zip busybox-3df47f9cbbb7f16608cbc642026625cdf7f06aa9.tar.gz | |
ash: do not expand tilde in parameter expansion within quotes
Test case:
unset a
echo "${a:-~root}"
Old result:
/root
New result:
~root
Based on commit 170f44d from git://git.kernel.org/pub/scm/utils/dash/dash.git
by Herbert Xu
function old new delta
evalvar 598 604 +6
parse_command 1440 1443 +3
localcmd 325 327 +2
readtoken1 3199 3200 +1
argstr 1180 1164 -16
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/1 up/down: 12/-16) Total: -4 bytes
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/ash_test')
| -rw-r--r-- | shell/ash_test/ash-vars/var-do-not-expand-tilde-in-parameter-expansion-in-quotes.right | 1 | ||||
| -rwxr-xr-x | shell/ash_test/ash-vars/var-do-not-expand-tilde-in-parameter-expansion-in-quotes.tests | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/shell/ash_test/ash-vars/var-do-not-expand-tilde-in-parameter-expansion-in-quotes.right b/shell/ash_test/ash-vars/var-do-not-expand-tilde-in-parameter-expansion-in-quotes.right new file mode 100644 index 0000000..4b9b4f0 --- /dev/null +++ b/shell/ash_test/ash-vars/var-do-not-expand-tilde-in-parameter-expansion-in-quotes.right @@ -0,0 +1 @@ +~root diff --git a/shell/ash_test/ash-vars/var-do-not-expand-tilde-in-parameter-expansion-in-quotes.tests b/shell/ash_test/ash-vars/var-do-not-expand-tilde-in-parameter-expansion-in-quotes.tests new file mode 100755 index 0000000..d8eb8fc --- /dev/null +++ b/shell/ash_test/ash-vars/var-do-not-expand-tilde-in-parameter-expansion-in-quotes.tests @@ -0,0 +1,2 @@ +unset a +echo "${a:-~root}" |