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

hush: simplify \<newline> code, part 1

Browse Source 
function                                             old     new   delta
parse_stream                                        2919    2787    -132

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-04-10 13:09:26 +02:00
parent 09b7a7ec0e
commit 1c57269b5d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
shell/hush.c
View File

@ -4913,6 +4913,9 @@ static int encode_string(o_string *as_string,
ch, ch, !!(dest->o_expflags & EXP_FLAG_ESC_GLOB_CHARS)); ch, ch, !!(dest->o_expflags & EXP_FLAG_ESC_GLOB_CHARS));
if (process_bkslash && ch == '\\') { if (process_bkslash && ch == '\\') {
if (next == EOF) { if (next == EOF) {
// TODO: what if in interactive shell a file with
// echo "unterminated string\<eof>
// is sourced?
syntax_error("\\<eof>"); syntax_error("\\<eof>");
xfunc_die(); xfunc_die();
} }
@ -5051,12 +5054,14 @@ static struct pipe *parse_stream(char **pstring,
next = '\0'; next = '\0';
if (ch != '\n') { if (ch != '\n') {
next = i_peek(input); /* Do not break this case:
/* Can't use i_peek_and_eat_bkslash_nl(input) here:
* echo '\ * echo '\
* ' * '
* will break. * and
* echo z\\
*/ */
next = (ch == '\'' || ch == '\\') ? i_peek(input) : i_peek_and_eat_bkslash_nl(input);
///
} }
is_special = "{}<>;&|()#'" /* special outside of "str" */ is_special = "{}<>;&|()#'" /* special outside of "str" */
@ -5260,8 +5265,6 @@ 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);
@ -5282,8 +5285,6 @@ 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++;
@ -5327,6 +5328,7 @@ static struct pipe *parse_stream(char **pstring,
continue; /* back to top of while (1) */ continue; /* back to top of while (1) */
} }
break; break;
#if 0 /* looks like we never reach this code */
case '\\': case '\\':
if (next == '\n') { if (next == '\n') {
/* It's "\<newline>" */ /* It's "\<newline>" */
@ -5338,6 +5340,7 @@ static struct pipe *parse_stream(char **pstring,
continue; /* back to top of while (1) */ continue; /* back to top of while (1) */
} }
break; break;
#endif
} }
if (ctx.is_assignment == MAYBE_ASSIGNMENT if (ctx.is_assignment == MAYBE_ASSIGNMENT
@ -5364,6 +5367,7 @@ static struct pipe *parse_stream(char **pstring,
break; break;
case '\\': case '\\':
if (next == EOF) { if (next == EOF) {
//TODO: in ". FILE" containing "cmd\" (no newline) bash ignores last "\"
syntax_error("\\<eof>"); syntax_error("\\<eof>");
xfunc_die(); xfunc_die();
} }
@ -5473,8 +5477,6 @@ static struct pipe *parse_stream(char **pstring,
if (done_word(&ctx)) { if (done_word(&ctx)) {
goto parse_error; goto parse_error;
} }
if (next == '\\')
next = i_peek_and_eat_bkslash_nl(input);
if (next == '&') { if (next == '&') {
ch = i_getch(input); ch = i_getch(input);
nommu_addchr(&ctx.as_string, ch); nommu_addchr(&ctx.as_string, ch);
@ -5491,8 +5493,6 @@ static struct pipe *parse_stream(char **pstring,
if (ctx.ctx_res_w == RES_MATCH) if (ctx.ctx_res_w == RES_MATCH)
break; /* we are in case's "word | word)" */ break; /* we are in case's "word | word)" */
#endif #endif
if (next == '\\')
next = i_peek_and_eat_bkslash_nl(input);
if (next == '|') { /* || */ if (next == '|') { /* || */
ch = i_getch(input); ch = i_getch(input);
nommu_addchr(&ctx.as_string, ch); nommu_addchr(&ctx.as_string, ch);