pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-07-13 23:20:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20181210 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2018-12-14 09:19:57 -05:00
parent 9d80be9ab5
commit 8bf3cfef2d
3 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
variables.c
+26 -5
View File
@@ -169,6 +169,7 @@ SHELL_VAR nameref_invalid_value;
static SHELL_VAR nameref_maxloop_value;
static HASH_TABLE *last_table_searched; /* hash_lookup sets this */
static VAR_CONTEXT *last_context_searched;
/* Some forward declarations. */
static void create_variable_tables __P((void));
@@ -2607,6 +2608,17 @@ make_local_variable (name, flags)
if (was_tmpvar && old_var->context == variable_context && last_table_searched != temporary_env)
{
VUNSETATTR (old_var, att_invisible); /* XXX */
#if 0 /* TAG:bash-5.1 */
/* We still want to flag this variable as local, though, and set things
up so that it gets treated as a local variable. */
new_var = old_var;
/* Since we found the variable in a temporary environment, this will
succeed. */
for (vc = shell_variables; vc; vc = vc->down)
if (vc_isfuncenv (vc) && vc->scope == variable_context)
break;
goto set_local_var_flags;
#endif
return (old_var);
}
@@ -2694,6 +2706,7 @@ make_local_variable (name, flags)
new_var->attributes = exported_p (old_var) ? att_exported : 0;
}
set_local_var_flags:
vc->flags |= VC_HASLOCAL;
new_var->context = variable_context;
@@ -3213,6 +3226,9 @@ bind_variable (name, value, flags)
nvc = vc;
if (v && nameref_p (v))
{
/* This starts at the context where we found the nameref. If we
want to start the name resolution over again at the original
context, this is where we need to change it */
nv = find_variable_nameref_context (v, vc, &nvc);
if (nv == 0)
{
@@ -3234,8 +3250,9 @@ bind_variable (name, value, flags)
else if (nv == &nameref_maxloop_value)
{
internal_warning (_("%s: circular name reference"), v->name);
#if 0
return (bind_variable_value (v, value, flags|ASS_NAMEREF));
#if 1
/* TAG:bash-5.1 */
return (bind_global_variable (v->name, value, flags));
#else
v = 0; /* backwards compat */
#endif
@@ -3246,8 +3263,9 @@ bind_variable (name, value, flags)
else if (nv == &nameref_maxloop_value)
{
internal_warning (_("%s: circular name reference"), v->name);
#if 0
return (bind_variable_value (v, value, flags|ASS_NAMEREF));
#if 1
/* TAG:bash-5.1 */
return (bind_global_variable (v->name, value, flags));
#else
v = 0; /* backwards compat */
#endif
@@ -3557,7 +3575,10 @@ assign_in_env (word, flags)
but the variable does not already exist, assign to the nameref
target and add the target to the temporary environment. This is
what ksh93 does */
if (var && nameref_p (var) && valid_nameref_value (nameref_cell (var), 1))
/* We use 2 in the call to valid_nameref_value because we don't want
to allow array references here at all (newname will be used to
create a variable directly below) */
if (var && nameref_p (var) && valid_nameref_value (nameref_cell (var), 2))
{
newname = nameref_cell (var);
var = 0; /* don't use it for append */