diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-08-05 14:29:58 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-08-05 14:29:58 +0200 |
| commit | 440da97ed79841b55f0b61e4108a336b61642bff (patch) | |
| tree | 9cb31a0c1dabd368d8451d92be5506c15a81c8c5 /shell/hush_test | |
| parent | 67dae152f4bf5456e4ea7950f4b55356aa37ec6c (diff) | |
| download | busybox-440da97ed79841b55f0b61e4108a336b61642bff.tar.gz | |
ash: expand: Fix ghost fields with unquoted $@/$*
Upstream commit:
Date: Fri, 23 Mar 2018 18:58:47 +0800
expand: Fix ghost fields with unquoted $@/$*
You're right. The proper fix to this is to ensure that nulonly
is not set in varvalue for $*. It should only be set for $@ when
it's inside double quotes.
In fact there is another bug while we're playing with $@/$*.
When IFS is set to a non-whitespace character such as :, $*
outside quotes won't remove empty fields as it should.
This patch fixes both problems.
Reported-by: Martijn Dekker <martijn@inlv.org>
Suggested-by: Harald van Dijk <harald@gigawatt.nl>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
function old new delta
argstr 1111 1113 +2
evalvar 571 569 -2
varvalue 579 576 -3
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/2 up/down: 2/-5) Total: -3 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush_test')
| -rw-r--r-- | shell/hush_test/hush-vars/var_wordsplit_ifs5.right | 1 | ||||
| -rwxr-xr-x | shell/hush_test/hush-vars/var_wordsplit_ifs5.tests | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/shell/hush_test/hush-vars/var_wordsplit_ifs5.right b/shell/hush_test/hush-vars/var_wordsplit_ifs5.right new file mode 100644 index 000000000..46ffcece7 --- /dev/null +++ b/shell/hush_test/hush-vars/var_wordsplit_ifs5.right @@ -0,0 +1 @@ +Zero:0 diff --git a/shell/hush_test/hush-vars/var_wordsplit_ifs5.tests b/shell/hush_test/hush-vars/var_wordsplit_ifs5.tests new file mode 100755 index 000000000..d382116df --- /dev/null +++ b/shell/hush_test/hush-vars/var_wordsplit_ifs5.tests @@ -0,0 +1,4 @@ +IFS= +set -- +set -- $@ $* +echo Zero:$# |