commit bash-20110311 snapshot

This commit is contained in:
Chet Ramey
2011-12-29 13:05:08 -05:00
parent 40647963e2
commit d9e1f41e7f
49 changed files with 13947 additions and 12188 deletions
+6 -5
View File
@@ -271,7 +271,7 @@ assign_array_element (name, value, flags)
}
else
{
ind = array_expand_index (sub, sublen);
ind = array_expand_index (entry, sub, sublen);
if (ind < 0)
{
free (vname);
@@ -485,7 +485,7 @@ assign_compound_array_list (var, nlist, flags)
if (array_p (var))
{
ind = array_expand_index (w + 1, len);
ind = array_expand_index (var, w + 1, len);
if (ind < 0)
{
err_badarraysub (w);
@@ -662,7 +662,7 @@ unbind_array_element (var, sub)
}
else
{
ind = array_expand_index (sub, len+1);
ind = array_expand_index (var, sub, len+1);
if (ind < 0)
{
builtin_error ("[%s]: %s", sub, _(bash_badsub_errmsg));
@@ -752,7 +752,8 @@ valid_array_reference (name)
/* Expand the array index beginning at S and extending LEN characters. */
arrayind_t
array_expand_index (s, len)
array_expand_index (var, s, len)
SHELL_VAR *var;
char *s;
int len;
{
@@ -934,7 +935,7 @@ array_value_internal (s, quoted, flags, rtype, indp)
{
if ((flags & AV_USEIND) == 0 || indp == 0)
{
ind = array_expand_index (t, len);
ind = array_expand_index (var, t, len);
if (ind < 0)
{
/* negative subscripts to indexed arrays count back from end */