dmbcs/i-bash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bash-4.3 patch 31

Browse source
This commit is contained in:
Chet Ramey 2015-01-15 10:20:04 -05:00
commit f9d85604a7
4 changed files with 5397 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
variables.c
View file

@ -2516,10 +2516,27 @@ bind_variable_internal (name, value, table, hflags, aflags)
HASH_TABLE *table;
int hflags, aflags;
{
char *newval;
char *newname, *newval;
SHELL_VAR *entry;
#if defined (ARRAY_VARS)
arrayind_t ind;
char *subp;
int sublen;
#endif
newname = 0;
#if defined (ARRAY_VARS)
if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference (name))
{
newname = array_variable_name (name, &subp, &sublen);
if (newname == 0)
return (SHELL_VAR *)NULL; /* XXX */
entry = hash_lookup (newname, table);
}
else
#endif
entry = (hflags & HASH_NOSRCH) ? (SHELL_VAR *)NULL : hash_lookup (name, table);
/* Follow the nameref chain here if this is the global variables table */
if (entry && nameref_p (entry) && (invisible_p (entry) == 0) && table == global_variables->table)
{
@ -2550,6 +2567,16 @@ bind_variable_internal (name, value, table, hflags, aflags)
var_setvalue (entry, make_variable_value (entry, value, 0));
}
}
#if defined (ARRAY_VARS)
else if (entry == 0 && newname)
{
entry = make_new_array_variable (newname); /* indexed array by default */
if (entry == 0)
return entry;
ind = array_expand_index (name, subp, sublen);
bind_array_element (entry, ind, value, aflags);
}
#endif
else if (entry == 0)
{
entry = make_new_variable (name, table);
@ -2670,7 +2697,8 @@ bind_variable (name, value, flags)
normal. */
if (nameref_cell (nv) == 0)
return (bind_variable_internal (nv->name, value, nvc->table, 0, flags));
return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags));
/* XXX - bug here with ref=array[index] */
return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags|ASS_FROMREF));
}
else
v = nv;