pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-06-27 15:43:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20060504 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2011-12-03 22:47:59 -05:00
parent 3969cd9680
commit 8b35878f7d
19 changed files with 1316 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arrayfunc.c
+50 -20
View File
@@ -1,6 +1,6 @@
/* arrayfunc.c -- High-level array functions used by other parts of the shell. */
/* Copyright (C) 2001-2005 Free Software Foundation, Inc.
/* Copyright (C) 2001-2006 Free Software Foundation, Inc.
This file is part of GNU Bash, the Bourne Again SHell.
@@ -265,23 +265,18 @@ assign_array_var_from_word_list (var, list, flags)
return var;
}
/* Perform a compound array assignment: VAR->name=( VALUE ). The
VALUE has already had the parentheses stripped. */
SHELL_VAR *
assign_array_var_from_string (var, value, flags)
SHELL_VAR *var;
static WORD_LIST empty_compound_list;
WORD_LIST *
expand_compound_array_assignment (value, flags)
char *value;
int flags;
{
ARRAY *a;
WORD_LIST *list, *nlist;
char *w, *val, *nval;
int ni, len;
char *val;
int ni;
arrayind_t ind, last_ind;
if (value == 0)
return var;
/* If this is called from declare_builtin, value[0] == '(' and
xstrchr(value, ')') != 0. In this case, we need to extract
the value from between the parens before going on. */
@@ -290,7 +285,7 @@ assign_array_var_from_string (var, value, flags)
ni = 1;
val = extract_array_assignment_list (value, &ni);
if (val == 0)
return var;
return &empty_compound_list;
}
else
val = value;
@@ -315,6 +310,21 @@ assign_array_var_from_string (var, value, flags)
if (val != value)
free (val);
return nlist;
}
void
assign_compound_array_list (var, nlist, flags)
SHELL_VAR *var;
WORD_LIST *nlist;
int flags;
{
ARRAY *a;
WORD_LIST *list;
char *w, *val, *nval;
int len, iflags;
arrayind_t ind, last_ind;
a = array_cell (var);
/* Now that we are ready to assign values to the array, kill the existing
@@ -325,6 +335,7 @@ assign_array_var_from_string (var, value, flags)
for (list = nlist; list; list = list->next)
{
iflags = flags;
w = list->word->word;
/* We have a word of the form [ind]=value */
@@ -332,12 +343,8 @@ assign_array_var_from_string (var, value, flags)
{
len = skipsubscript (w, 0);
#if 1
/* XXX - changes for `+=' */
if (w[len] != ']' || (w[len+1] != '=' && (w[len+1] != '+' || w[len+2] != '=')))
#else
if (w[len] != ']' || w[len+1] != '=')
#endif
{
nval = make_variable_value (var, w, flags);
if (var->assign_func)
@@ -368,10 +375,10 @@ assign_array_var_from_string (var, value, flags)
continue;
}
last_ind = ind;
/* XXX - changes for `+=' */
/* XXX - changes for `+=' -- just accept the syntax. ksh93 doesn't do this */
if (w[len + 1] == '+' && w[len + 2] == '=')
{
flags |= ASS_APPEND;
iflags |= ASS_APPEND;
val = w + len + 3;
}
else
@@ -385,9 +392,32 @@ assign_array_var_from_string (var, value, flags)
if (integer_p (var))
this_command_name = (char *)NULL; /* no command name for errors */
bind_array_var_internal (var, ind, val, flags);
bind_array_var_internal (var, ind, val, iflags);
last_ind++;
}
}
/* Perform a compound array assignment: VAR->name=( VALUE ). The
VALUE has already had the parentheses stripped. */
SHELL_VAR *
assign_array_var_from_string (var, value, flags)
SHELL_VAR *var;
char *value;
int flags;
{
WORD_LIST *nlist;
if (value == 0)
return var;
nlist = expand_compound_array_assignment (value, flags);
/* XXX - I don't think the code path that produces this is executed
any more with the changes in how local array assignments are
performed. */
if (nlist == &empty_compound_list)
return var;
assign_compound_array_list (var, nlist, flags);
dispose_words (nlist);
return (var);