diff options
author | Chet Ramey <chet.ramey@case.edu> | 2015-08-13 15:38:42 -0400 |
---|---|---|
committer | Tom Powell <zifnab@zifnab06.net> | 2015-10-08 20:53:37 -0700 |
commit | d6d5649dba0ac3deb827062dc1344c0561b41d0d (patch) | |
tree | 06830b8857ea9f1c18f444c5f4dcd11a3aed117b | |
parent | 857afac0f64e6be71026c49215f16ba7ca5fef71 (diff) | |
download | android_external_bash-d6d5649dba0ac3deb827062dc1344c0561b41d0d.tar.gz android_external_bash-d6d5649dba0ac3deb827062dc1344c0561b41d0d.tar.bz2 android_external_bash-d6d5649dba0ac3deb827062dc1344c0561b41d0d.zip |
Bash-4.3 patch 42
Change-Id: I6f01effd47b78771c7747f4314bda10cbd3a5c99
-rw-r--r-- | parse.y | 2 | ||||
-rw-r--r-- | patchlevel.h | 2 | ||||
-rw-r--r-- | y.tab.c | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -3708,6 +3708,8 @@ eof_error: /*itrace("parse_comsub:%d: lex_inword -> 1 ch = `%c' (%d)", line_number, ch, __LINE__);*/ tflags |= LEX_INWORD; lex_wlen = 0; + if (tflags & LEX_RESWDOK) + lex_rwlen = 0; } } diff --git a/patchlevel.h b/patchlevel.h index 44f59c7..9b7b0e5 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 41 +#define PATCHLEVEL 42 #endif /* _PATCHLEVEL_H_ */ @@ -6020,6 +6020,8 @@ eof_error: /*itrace("parse_comsub:%d: lex_inword -> 1 ch = `%c' (%d)", line_number, ch, __LINE__);*/ tflags |= LEX_INWORD; lex_wlen = 0; + if (tflags & LEX_RESWDOK) + lex_rwlen = 0; } } |