mirror of
https://github.com/sheumann/hush.git
synced 2024-08-21 11:28:57 +00:00
hush: fix \<newline> handling
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
b1cfc45376
commit
e19e1935a3
16
shell/hush.c
16
shell/hush.c
@ -50,14 +50,9 @@
|
||||
*
|
||||
* TODOs:
|
||||
* grep for "TODO" and fix (some of them are easy)
|
||||
* change { and } from special chars to reserved words
|
||||
* $var refs in function do not pick up values set by "var=val func"
|
||||
* builtins: ulimit
|
||||
* follow IFS rules more precisely, including update semantics
|
||||
* figure out what to do with backslash-newline
|
||||
* continuation lines, both explicit and implicit - done?
|
||||
* separate job control from interactiveness
|
||||
* (testcase: booting with init=/bin/hush does not show prompt (2009-04))
|
||||
*
|
||||
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
|
||||
*/
|
||||
@ -5347,10 +5342,12 @@ static int parse_stream_dquoted(o_string *as_string,
|
||||
* $, `, ", \, or <newline>. A double quote may be quoted
|
||||
* within double quotes by preceding it with a backslash.
|
||||
*/
|
||||
if (strchr("$`\"\\", next) != NULL) {
|
||||
if (strchr("$`\"\\\n", next) != NULL) {
|
||||
ch = i_getch(input);
|
||||
if (ch != '\n') {
|
||||
o_addqchr(dest, ch);
|
||||
nommu_addchr(as_string, ch);
|
||||
}
|
||||
} else {
|
||||
o_addqchr(dest, '\\');
|
||||
nommu_addchr(as_string, '\\');
|
||||
@ -5677,13 +5674,16 @@ static struct pipe *parse_stream(char **pstring,
|
||||
syntax_error("\\<eof>");
|
||||
xfunc_die();
|
||||
}
|
||||
o_addchr(&dest, '\\');
|
||||
ch = i_getch(input);
|
||||
nommu_addchr(&ctx.as_string, ch);
|
||||
if (ch != '\n') {
|
||||
o_addchr(&dest, '\\');
|
||||
nommu_addchr(&ctx.as_string, '\\');
|
||||
o_addchr(&dest, ch);
|
||||
nommu_addchr(&ctx.as_string, ch);
|
||||
/* Example: echo Hello \2>file
|
||||
* we need to know that word 2 is quoted */
|
||||
dest.o_quoted = 1;
|
||||
}
|
||||
break;
|
||||
case '$':
|
||||
if (handle_dollar(&ctx.as_string, &dest, input) != 0) {
|
||||
|
2
shell/hush_test/hush-parsing/escape4.right
Normal file
2
shell/hush_test/hush-parsing/escape4.right
Normal file
@ -0,0 +1,2 @@
|
||||
Ok
|
||||
End
|
6
shell/hush_test/hush-parsing/escape4.tests
Executable file
6
shell/hush_test/hush-parsing/escape4.tests
Executable file
@ -0,0 +1,6 @@
|
||||
i\
|
||||
f tr\
|
||||
ue; th\
|
||||
en echo "O\
|
||||
k"; fi; echo "\
|
||||
End"
|
0
shell/hush_test/hush-parsing/group1.tests
Normal file → Executable file
0
shell/hush_test/hush-parsing/group1.tests
Normal file → Executable file
Loading…
Reference in New Issue
Block a user