diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2014-03-28 11:53:44 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2014-03-28 11:53:44 -0400 |
| commit | bc63a081829cb10b36a173907ed02e3c2374cd4b (patch) | |
| tree | a77c712c5cdf4796043b773d6b37b0e69e35f347 | |
| parent | 84fc3e272f57d4f38f3811470b7b708b568742db (diff) | |
| download | android_external_bash-bc63a081829cb10b36a173907ed02e3c2374cd4b.tar.gz android_external_bash-bc63a081829cb10b36a173907ed02e3c2374cd4b.tar.bz2 android_external_bash-bc63a081829cb10b36a173907ed02e3c2374cd4b.zip | |
Bash-4.3 patch 5
| -rw-r--r-- | parse.y | 2 | ||||
| -rw-r--r-- | patchlevel.h | 2 | ||||
| -rw-r--r-- | y.tab.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -3398,7 +3398,7 @@ parse_matched_pair (qc, open, close, lenp, flags) within a double-quoted ${...} construct "an even number of unescaped double-quotes or single-quotes, if any, shall occur." */ /* This was changed in Austin Group Interp 221 */ - if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'') + if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'') continue; /* Could also check open == '`' if we want to parse grouping constructs diff --git a/patchlevel.h b/patchlevel.h index 9a65c37..11097c3 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 4 +#define PATCHLEVEL 5 #endif /* _PATCHLEVEL_H_ */ @@ -5710,7 +5710,7 @@ parse_matched_pair (qc, open, close, lenp, flags) within a double-quoted ${...} construct "an even number of unescaped double-quotes or single-quotes, if any, shall occur." */ /* This was changed in Austin Group Interp 221 */ - if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'') + if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'') continue; /* Could also check open == '`' if we want to parse grouping constructs |