Bash-4.3 patch 20

diff --git a/parse.y b/parse.y
index 91bf3bf649bd85476758436c54504b2b9eab3bf3..cd3cf1e39f010935767e089101ca0ada83b1d516 100644 (file)
--- a/parse.y
+++ b/parse.y
@@ -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 0a57e4b8ea100c205de48e492af08d109387b866..6b5f365e32a2223a430070d32d1fab2de89de7d8 100644 (file)
--- 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_ */

diff --git a/shell.h b/shell.h
index 243e4678c7fa80b19496c31ae49a5d4106e3f100..d63dce8cd83fe896dbe98f93903fcd5da4b25077 100644 (file)
--- a/shell.h
+++ b/shell.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 {

diff --git a/y.tab.c b/y.tab.c
index 80fe9308398ebec2f4dd076ef08bb2eed2741fa5..8f7f96ebe641449dca36605a92642b9939c6a108 100644 (file)
--- a/y.tab.c
+++ b/y.tab.c
@@ -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;