emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash,hush: properly handle ${v//pattern/repl} if pattern starts with /

Browse Source 
Closes 2695

function                                             old     new   delta
parse_dollar                                         762     790     +28
subevalvar                                          1258    1267      +9
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 37/0)               Total: 37 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2018-08-04 22:25:28 +02:00
parent 2005d3ff36
commit c2aa218f23
6 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shell/hush.c
View File

@ -4930,6 +4930,15 @@ static int parse_dollar(o_string *as_string,
end_ch = '}' * 0x100 + '/';
}
o_addchr(dest, ch);
/* The pattern can't be empty.
* IOW: if the first char after "${v//" is a slash,
* it does not terminate the pattern - it's the first char of the pattern:
* v=/dev/ram; echo ${v////-} prints -dev-ram (pattern is "/")
* v=/dev/ram; echo ${v///r/-} prints /dev-am (pattern is "/r")
*/
if (i_peek(input) == '/') {
o_addchr(dest, i_getch(input));
}
again:
if (!BB_MMU)
pos = dest->length;