89e9d5534
Denys Vlasenko
2018-04-11
Subject
hush: do not drop backslash from eval 'echo ok\'
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/ash.c +1 -1shell/ash_test/ash-parsing/bkslash_eof1.right +1 -0shell/ash_test/ash-parsing/bkslash_eof1.tests +1 -0shell/ash_test/ash-redir/redir_exec1.right +1 -1shell/hush.c +17 -5shell/hush_test/hush-parsing/bkslash_eof1.right +1 -1
shell/ash.c+1 -1
| @@ -203,7 +203,7 @@ | |
| * TODO: | |
| * singleword+noglob expansion: | |
| * v='a b'; [[ $v = 'a b' ]]; echo 0:$? | |
| - | * [[ /bin/* ]]; echo 0:$? |
| + | * [[ /bin/n* ]]; echo 0:$? |
| * -a/-o are not AND/OR ops! (they are just strings) | |
| * quoting needs to be considered (-f is an operator, "-f" and ""-f are not; etc) | |
| * = is glob match operator, not equality operator: STR = GLOB | |
shell/ash_test/ash-parsing/bkslash_eof1.right+1 -0
| @@ -0,0 +1 @@ | |
| + | ok\ |
shell/ash_test/ash-parsing/bkslash_eof1.tests+1 -0
| @@ -0,0 +1 @@ | |
| + | eval 'echo ok\' |
shell/ash_test/ash-redir/redir_exec1.right+1 -1
| @@ -1,2 +1,2 @@ | |
| - | redir_exec1.tests: line 1: can't create /cant/be/created: nonexistent directory |
| + | ./redir_exec1.tests: line 1: can't create /cant/be/created: nonexistent directory |
| First | |
shell/hush.c+17 -5
| @@ -83,7 +83,7 @@ | |
| * Status of [[ support: | |
| * [[ args ]] are CMD_SINGLEWORD_NOGLOB: | |
| * v='a b'; [[ $v = 'a b' ]]; echo 0:$? | |
| - | * [[ /bin/* ]]; echo 0:$? |
| + | * [[ /bin/n* ]]; echo 0:$? |
| * TODO: | |
| * &&/|| are AND/OR ops, -a/-o are not | |
| * quoting needs to be considered (-f is an operator, "-f" and ""-f are not; etc) | |
| @@ -1426,8 +1426,19 @@ static char *unbackslash(char *src) | |
| { | |
| char *dst = src = strchrnul(src, '\\'); | |
| while (1) { | |
| - | if (*src == '\\') |
| + | if (*src == '\\') { |
| src++; | |
| + | if (*src != '\0') { |
| + | /* \x -> x */ |
| + | *dst++ = *src++; |
| + | continue; |
| + | } |
| + | /* else: "\<nul>". Do not delete this backslash. |
| + | * Testcase: eval 'echo ok\' |
| + | */ |
| + | *dst++ = '\\'; |
| + | /* fallthrough */ |
| + | } |
| if ((*dst++ = *src++) == '\0') | |
| break; | |
| } | |
| @@ -5392,16 +5403,17 @@ static struct pipe *parse_stream(char **pstring, | |
| continue; /* get next char */ | |
| case '\\': | |
| /*nommu_addchr(&ctx.as_string, '\\'); - already done */ | |
| + | o_addchr(&ctx.word, '\\'); |
| ch = i_getch(input); | |
| if (ch == EOF) { | |
| - | /* Ignore this '\'. Testcase: eval 'echo Ok\' */ |
| - | #if !BB_MMU |
| + | /* Testcase: eval 'echo Ok\' */ |
| + | |
| + | #if 0 /* bash-4.3.43 was removing backslash, but 4.4.19 retains it, most other shells too */ |
| /* Remove trailing '\' from ctx.as_string */ | |
| ctx.as_string.data[--ctx.as_string.length] = '\0'; | |
| #endif | |
| continue; /* get next char */ | |
| } | |
| - | o_addchr(&ctx.word, '\\'); |
| /* Example: echo Hello \2>file | |
| * we need to know that word 2 is quoted | |
| */ | |
shell/hush_test/hush-parsing/bkslash_eof1.right+1 -1
| @@ -1 +1 @@ | |
| - | ok |
| + | ok\ |