diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-07-17 14:21:38 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-07-17 14:21:38 +0200 |
commit | b762c784caa78877a9949224af425e52db237beb (patch) | |
tree | f452b87d4abd8d48bb1c711f9330c786b4c3fe6e /shell/hush_test/hush-z_slow | |
parent | 1fbb73fc4cee44f0768fbb09fe8f41a52d47ed3e (diff) | |
download | busybox-w32-b762c784caa78877a9949224af425e52db237beb.tar.gz busybox-w32-b762c784caa78877a9949224af425e52db237beb.tar.bz2 busybox-w32-b762c784caa78877a9949224af425e52db237beb.zip |
hush: improve ${var#...}, ${var:+...} and ${var/.../...} - handle quoting
dollar_altvalue1 test partially fails: word splitting of unquoted ${var:+...}
is not correct
function old new delta
encode_then_expand_vararg - 443 +443
expand_one_var 1599 1610 +11
parse_stream 2756 2753 -3
encode_string 250 242 -8
setup_heredoc 308 298 -10
expand_and_evaluate_arith 106 96 -10
encode_then_expand_string 142 126 -16
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/5 up/down: 454/-47) Total: 407 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush_test/hush-z_slow')
-rwxr-xr-x | shell/hush_test/hush-z_slow/many_ifs.tests | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/hush_test/hush-z_slow/many_ifs.tests b/shell/hush_test/hush-z_slow/many_ifs.tests index 1f5b1b3a6..cf9a89874 100755 --- a/shell/hush_test/hush-z_slow/many_ifs.tests +++ b/shell/hush_test/hush-z_slow/many_ifs.tests | |||
@@ -229,8 +229,8 @@ do | |||
229 | '') split "$d0$f1$d1$f2$d2$f3$d3" "[2]($f1)($f2)" "($f1)($f2)" ;; | 229 | '') split "$d0$f1$d1$f2$d2$f3$d3" "[2]($f1)($f2)" "($f1)($f2)" ;; |
230 | ' ') ;; | 230 | ' ') ;; |
231 | *) x=$f2$d2$f3$d3 | 231 | *) x=$f2$d2$f3$d3 |
232 | x=${x# } #was x=${x#' '} hush needs fixing for this to work | 232 | x=${x#' '} |
233 | x=${x% } #was x=${x%' '} | 233 | x=${x%' '} |
234 | split "$d0$f1$d1$f2$d2$f3$d3" "[3]($f1)($f2)($f3)" "($f1)($x)" | 234 | split "$d0$f1$d1$f2$d2$f3$d3" "[3]($f1)($f2)($f3)" "($f1)($x)" |
235 | ;; | 235 | ;; |
236 | esac | 236 | esac |