diff options
author | Chet Ramey <chet.ramey@case.edu> | 2014-09-26 17:00:50 -0400 |
---|---|---|
committer | Chet Ramey <chet.ramey@case.edu> | 2014-09-26 17:00:50 -0400 |
commit | 836a17be08ee0696b89367ab1aa27d0be87169ed (patch) | |
tree | a073ee2bd1e9cd21c922acff0d0d0fee33bf51c6 | |
parent | b64a0e1d0b412cedda763a32d6e5cd6927333f02 (diff) | |
download | android_external_bash-836a17be08ee0696b89367ab1aa27d0be87169ed.tar.gz android_external_bash-836a17be08ee0696b89367ab1aa27d0be87169ed.tar.bz2 android_external_bash-836a17be08ee0696b89367ab1aa27d0be87169ed.zip |
Bash-4.3 patch 26
-rw-r--r-- | parse.y | 2 | ||||
-rw-r--r-- | patchlevel.h | 2 | ||||
-rw-r--r-- | y.tab.c | 3 |
3 files changed, 5 insertions, 2 deletions
@@ -2953,6 +2953,8 @@ reset_parser () FREE (word_desc_to_read); word_desc_to_read = (WORD_DESC *)NULL; + eol_ungetc_lookahead = 0; + current_token = '\n'; /* XXX */ last_read_token = '\n'; token_to_read = '\n'; diff --git a/patchlevel.h b/patchlevel.h index e987c57..535a291 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 25 +#define PATCHLEVEL 26 #endif /* _PATCHLEVEL_H_ */ @@ -5265,6 +5265,8 @@ reset_parser () FREE (word_desc_to_read); word_desc_to_read = (WORD_DESC *)NULL; + eol_ungetc_lookahead = 0; + current_token = '\n'; /* XXX */ last_read_token = '\n'; token_to_read = '\n'; @@ -8539,4 +8541,3 @@ set_line_mbstate () } } #endif /* HANDLE_MULTIBYTE */ - |