diff options
author | Chet Ramey <chet.ramey@case.edu> | 2014-08-01 15:30:48 -0400 |
---|---|---|
committer | Chet Ramey <chet.ramey@case.edu> | 2014-08-01 15:30:48 -0400 |
commit | daefb2c5197a17116586b411cd3f12d249cf4e4f (patch) | |
tree | ab499065c730a2cf67b057f821ecab21da8e5d9b | |
parent | 9b86eb22c434c8848c9d592cba32d7e8fdf61459 (diff) | |
download | android_external_bash-daefb2c5197a17116586b411cd3f12d249cf4e4f.tar.gz android_external_bash-daefb2c5197a17116586b411cd3f12d249cf4e4f.tar.bz2 android_external_bash-daefb2c5197a17116586b411cd3f12d249cf4e4f.zip |
Bash-4.3 patch 20
-rw-r--r-- | parse.y | 4 | ||||
-rw-r--r-- | patchlevel.h | 2 | ||||
-rw-r--r-- | shell.h | 3 | ||||
-rw-r--r-- | y.tab.c | 4 |
4 files changed, 9 insertions, 4 deletions
@@ -2642,7 +2642,7 @@ gather_here_documents () int r; r = 0; - while (need_here_doc) + while (need_here_doc > 0) { parser_state |= PST_HEREDOC; make_here_document (redir_stack[r++], line_number); @@ -6075,6 +6075,7 @@ save_parser_state (ps) ps->expand_aliases = expand_aliases; ps->echo_input_at_read = echo_input_at_read; + ps->need_here_doc = need_here_doc; ps->token = token; ps->token_buffer_size = token_buffer_size; @@ -6123,6 +6124,7 @@ restore_parser_state (ps) expand_aliases = ps->expand_aliases; echo_input_at_read = ps->echo_input_at_read; + need_here_doc = ps->need_here_doc; FREE (token); token = ps->token; diff --git a/patchlevel.h b/patchlevel.h index 0a57e4b..6b5f365 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 19 +#define PATCHLEVEL 20 #endif /* _PATCHLEVEL_H_ */ @@ -168,7 +168,8 @@ typedef struct _sh_parser_state_t { /* flags state affecting the parser */ int expand_aliases; int echo_input_at_read; - + int need_here_doc; + } sh_parser_state_t; typedef struct _sh_input_line_state_t { @@ -4954,7 +4954,7 @@ gather_here_documents () int r; r = 0; - while (need_here_doc) + while (need_here_doc > 0) { parser_state |= PST_HEREDOC; make_here_document (redir_stack[r++], line_number); @@ -8387,6 +8387,7 @@ save_parser_state (ps) ps->expand_aliases = expand_aliases; ps->echo_input_at_read = echo_input_at_read; + ps->need_here_doc = need_here_doc; ps->token = token; ps->token_buffer_size = token_buffer_size; @@ -8435,6 +8436,7 @@ restore_parser_state (ps) expand_aliases = ps->expand_aliases; echo_input_at_read = ps->echo_input_at_read; + need_here_doc = ps->need_here_doc; FREE (token); token = ps->token; |