Bash-4.3 patch 5

This commit is contained in:
Chet Ramey 2014-03-28 11:53:44 -04:00
commit bc63a08182
3 changed files with 3 additions and 3 deletions

View file

@ -3398,7 +3398,7 @@ parse_matched_pair (qc, open, close, lenp, flags)
within a double-quoted ${...} construct "an even number of within a double-quoted ${...} construct "an even number of
unescaped double-quotes or single-quotes, if any, shall occur." */ unescaped double-quotes or single-quotes, if any, shall occur." */
/* This was changed in Austin Group Interp 221 */ /* 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; continue;
/* Could also check open == '`' if we want to parse grouping constructs /* Could also check open == '`' if we want to parse grouping constructs

View file

@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 4 #define PATCHLEVEL 5
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */

View file

@ -5710,7 +5710,7 @@ parse_matched_pair (qc, open, close, lenp, flags)
within a double-quoted ${...} construct "an even number of within a double-quoted ${...} construct "an even number of
unescaped double-quotes or single-quotes, if any, shall occur." */ unescaped double-quotes or single-quotes, if any, shall occur." */
/* This was changed in Austin Group Interp 221 */ /* 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; continue;
/* Could also check open == '`' if we want to parse grouping constructs /* Could also check open == '`' if we want to parse grouping constructs