pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-08-02 16:28:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes for extended glob in compat mode; fix for brackets appearing in nested parameter expansions

Browse Source
This commit is contained in:
Chet Ramey
2022-10-07 17:46:16 -04:00
parent 38d9d3590f
commit 22f21b760e
13 changed files with 125 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parse.y
+13 -9
View File
@@ -125,7 +125,7 @@ do { \
} while (0)
#if defined (EXTENDED_GLOB)
extern int extended_glob;
extern int extended_glob, extglob_flag;
#endif
#if defined (TRANSLATABLE_STRINGS)
@@ -312,8 +312,6 @@ static int token_before_that;
/* The token read prior to token_before_that. */
static int two_tokens_ago;
static int global_extglob;
/* The line number in a script where the word in a `case WORD', `select WORD'
or `for WORD' begins. This is a nested command maximum, since the array
index is decremented after a case, select, or for command is parsed. */
@@ -3304,7 +3302,7 @@ reset_parser ()
#if defined (EXTENDED_GLOB)
/* Reset to global value of extended glob */
if (parser_state & (PST_EXTPAT|PST_CMDSUBST))
extended_glob = global_extglob;
extended_glob = extglob_flag;
#endif
parser_state = 0;
@@ -4118,10 +4116,10 @@ parse_comsub (qc, open, close, lenp, flags)
expand_aliases = posixly_correct != 0;
#if defined (EXTENDED_GLOB)
/* If (parser_state & PST_EXTPAT), we're parsing an extended pattern for a
conditional command and have already set global_extglob appropriately. */
conditional command and have already set extended_glob appropriately. */
if (shell_compatibility_level <= 51 && was_extpat == 0)
{
local_extglob = global_extglob = extended_glob;
local_extglob = extended_glob;
extended_glob = 1;
}
#endif
@@ -4229,7 +4227,7 @@ xparse_dolparen (base, string, indp, flags)
{
sh_parser_state_t ps;
sh_input_line_state_t ls;
int orig_ind, nc, sflags, start_lineno;
int orig_ind, nc, sflags, start_lineno, local_extglob;
char *ret, *ep, *ostring;
/*debug_parser(1);*/
@@ -4272,7 +4270,7 @@ xparse_dolparen (base, string, indp, flags)
old value will be restored by restore_parser_state(). */
expand_aliases = 0;
#if defined (EXTENDED_GLOB)
global_extglob = extended_glob; /* for reset_parser() */
local_extglob = extended_glob;
#endif
token_to_read = DOLPAREN; /* let's trick the parser */
@@ -4290,6 +4288,9 @@ xparse_dolparen (base, string, indp, flags)
restore_input_line_state (&ls);
restore_parser_state (&ps);
#if defined (EXTENDED_GLOB)
extended_glob = local_extglob;
#endif
token_to_read = 0;
/* If parse_string returns < 0, we need to jump to top level with the
@@ -4724,12 +4725,16 @@ cond_term ()
}
/* rhs */
#if defined (EXTENDED_GLOB)
local_extglob = extended_glob;
if (parser_state & PST_EXTPAT)
extended_glob = 1;
#endif
tok = read_token (READ);
#if defined (EXTENDED_GLOB)
if (parser_state & PST_EXTPAT)
extended_glob = local_extglob;
#endif
parser_state &= ~(PST_REGEXP|PST_EXTPAT);
if (tok == WORD)
@@ -4776,7 +4781,6 @@ parse_cond_command ()
{
COND_COM *cexp;
global_extglob = extended_glob;
cexp = cond_expr ();
return (make_cond_command (cexp));
}