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

hush: fix heredoc_bkslash_newline1.tests failure

Browse Source 
function                                             old     new   delta
parse_stream                                        2787    2827     +40
builtin_type                                         117     115      -2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-03-31 20:16:31 +02:00
parent 220be537a0
commit a94eeb0b42
1 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
shell/hush.c
View File

@ -2694,6 +2694,42 @@ static int i_peek2(struct in_str *i)
return ch; return ch;
} }
static int i_getch_and_eat_bkslash_nl(struct in_str *input)
{
for (;;) {
int ch, ch2;
ch = i_getch(input);
if (ch != '\\')
return ch;
ch2 = i_peek(input);
if (ch2 != '\n')
return ch;
/* backslash+newline, skip it */
i_getch(input);
}
}
/* Note: this function _eats_ \<newline> pairs, safe to use plain
* i_getch() after it instead of i_getch_and_eat_bkslash_nl().
*/
static int i_peek_and_eat_bkslash_nl(struct in_str *input)
{
for (;;) {
int ch, ch2;
ch = i_peek(input);
if (ch != '\\')
return ch;
ch2 = i_peek2(input);
if (ch2 != '\n')
return ch;
/* backslash+newline, skip it */
i_getch(input);
i_getch(input);
}
}
static void setup_file_in_str(struct in_str *i, FILE *f) static void setup_file_in_str(struct in_str *i, FILE *f)
{ {
memset(i, 0, sizeof(*i)); memset(i, 0, sizeof(*i));
@ -4014,7 +4050,7 @@ static int parse_redirect(struct parse_context *ctx,
if (dup_num == REDIRFD_SYNTAX_ERR) if (dup_num == REDIRFD_SYNTAX_ERR)
return 1; return 1;
} else { } else {
int ch = i_peek(input); int ch = i_peek_and_eat_bkslash_nl(input);
dup_num = (ch == '-'); /* HEREDOC_SKIPTABS bit is 1 */ dup_num = (ch == '-'); /* HEREDOC_SKIPTABS bit is 1 */
if (dup_num) { /* <<-... */ if (dup_num) { /* <<-... */
ch = i_getch(input); ch = i_getch(input);
@ -4024,7 +4060,7 @@ static int parse_redirect(struct parse_context *ctx,
} }
if (style == REDIRECT_OVERWRITE && dup_num == REDIRFD_TO_FILE) { if (style == REDIRECT_OVERWRITE && dup_num == REDIRFD_TO_FILE) {
int ch = i_peek(input); int ch = i_peek_and_eat_bkslash_nl(input);
if (ch == '|') { if (ch == '|') {
/* >|FILE redirect ("clobbering" >). /* >|FILE redirect ("clobbering" >).
* Since we do not support "set -o noclobber" yet, * Since we do not support "set -o noclobber" yet,
@ -4343,39 +4379,6 @@ static int parse_group(o_string *dest, struct parse_context *ctx,
/* command remains "open", available for possible redirects */ /* command remains "open", available for possible redirects */
} }
static int i_getch_and_eat_bkslash_nl(struct in_str *input)
{
for (;;) {
int ch, ch2;
ch = i_getch(input);
if (ch != '\\')
return ch;
ch2 = i_peek(input);
if (ch2 != '\n')
return ch;
/* backslash+newline, skip it */
i_getch(input);
}
}
static int i_peek_and_eat_bkslash_nl(struct in_str *input)
{
for (;;) {
int ch, ch2;
ch = i_peek(input);
if (ch != '\\')
return ch;
ch2 = i_peek2(input);
if (ch2 != '\n')
return ch;
/* backslash+newline, skip it */
i_getch(input);
i_getch(input);
}
}
#if ENABLE_HUSH_TICK || ENABLE_FEATURE_SH_MATH || ENABLE_HUSH_DOLLAR_OPS #if ENABLE_HUSH_TICK || ENABLE_FEATURE_SH_MATH || ENABLE_HUSH_DOLLAR_OPS
/* Subroutines for copying $(...) and `...` things */ /* Subroutines for copying $(...) and `...` things */
static int add_till_backquote(o_string *dest, struct in_str *input, int in_dquote); static int add_till_backquote(o_string *dest, struct in_str *input, int in_dquote);
@ -5181,6 +5184,8 @@ static struct pipe *parse_stream(char **pstring,
goto parse_error; goto parse_error;
} }
redir_style = REDIRECT_OVERWRITE; redir_style = REDIRECT_OVERWRITE;
if (next == '\\')
next = i_peek_and_eat_bkslash_nl(input);
if (next == '>') { if (next == '>') {
redir_style = REDIRECT_APPEND; redir_style = REDIRECT_APPEND;
ch = i_getch(input); ch = i_getch(input);
@ -5201,6 +5206,8 @@ static struct pipe *parse_stream(char **pstring,
goto parse_error; goto parse_error;
} }
redir_style = REDIRECT_INPUT; redir_style = REDIRECT_INPUT;
if (next == '\\')
next = i_peek_and_eat_bkslash_nl(input);
if (next == '<') { if (next == '<') {
redir_style = REDIRECT_HEREDOC; redir_style = REDIRECT_HEREDOC;
heredoc_cnt++; heredoc_cnt++;