ahill/toybox
1
0
Fork 0
mirror of https://codeberg.org/landley/toybox.git synced 2026-01-26 14:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better fix for backslash issue: parse_word(x, 1) never return NULL.

Browse Source
This commit is contained in:
Rob Landley 2023-09-05 04:42:09 -05:00
parent ca6b479810
commit 0c13db5030
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/sh.test
View File

@ -45,6 +45,7 @@ testing "trailing \\ in ''" "$SH -c \$'echo \\'one\\\\\\ntwo\\''" \
testing 'trailing \ in ""' "$SH -c \$'echo \"one\\\\\\ntwo\"'" 'onetwo\n' \
'' ''
testing 'vanishing \' "$SH -c \$'echo \\\\\\n a'" 'a\n' '' ''
testing 'command\ arg' "$SH -c \$'echo\\\\\\n abc'" 'abc\n' '' ''
testing "exec3" '$C -c "{ exec readlink /proc/self/fd/0;} < /proc/self/exe"' \
"$(readlink -f $C)\n" "" ""
testing 'arg shift' "$SH -c '"'for i in "" 2 1 1 1; do echo $? $1; shift $i; done'"' one two three four five" \
@ -237,7 +238,7 @@ testing 'hidden wildcards' \
testing "backtick1" 'x=fred; echo `echo $x`' 'fred\n' "" ""
testing "backtick2" 'x=fred; echo `x=y; echo $x`; echo $x' 'y\nfred\n' "" ""
testing '$(( ) )' 'echo ab$((echo hello) | tr e x)cd' "abhxllocd\n" "" ""
((++SKIP)); testing '$((x=y)) lifetime' 'a=boing; echo $a $a$((a=4))$a $a' 'boing boing44 4\n' '' ''
testing '$((x=y)) lifetime' 'a=boing; echo $a $a$((a=4))$a $a' 'boing boing44 4\n' '' ''
testing 'quote' "echo \"'\"" "'\n" "" ""

5
toys/pending/sh.c
View File

@ -1132,7 +1132,7 @@ static char *parse_word(char *start, int early)
} else if (*end=='(' && strchr("?*+@!", ii)) toybuf[quote++] = ')';
else {
if (ii!='\\') end--;
else if (!end[*end=='\n']) return *end ? 0 : end;
else if (!end[*end=='\n']) return (*end && !early) ? 0 : end;
if (early && !quote) return end;
}
end++;
@ -1884,6 +1884,7 @@ static int expand_arg_nobrace(struct sh_arg *arg, char *str, unsigned flags,
if (*ss != '<') ss = 0;
else {
while (isspace(*++ss));
// Can't return NULL because guaranteed ) context end
if (!(ll = parse_word(ss, 0)-ss)) ss = 0;
else {
jj = ll+(ss-s);
@ -2297,7 +2298,7 @@ static int expand_arg(struct sh_arg *arg, char *old, unsigned flags,
// collect brace spans
if ((TT.options&OPT_B) && !(flags&NO_BRACE)) for (i = 0; ; i++) {
// skip quoted/escaped text
while ((s = parse_word(old+i, 1)) != old+i && s) i += s-(old+i);
while ((s = parse_word(old+i, 1)) != old+i) i += s-(old+i);
// start a new span
if (old[i] == '{') {