dmbcs/i-bash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bash-4.3 patch 20

Browse source
This commit is contained in:
Chet Ramey 2014-08-01 15:30:48 -04:00
commit daefb2c519
4 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
parse.y
View file

@ -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;

2
patchlevel.h
View file

@ -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_ */

3
shell.h
View file

@ -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 {

4
y.tab.c
View file

@ -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;