diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2014-09-25 08:45:07 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2014-09-25 08:45:07 -0400 |
| commit | b64a0e1d0b412cedda763a32d6e5cd6927333f02 (patch) | |
| tree | 8f329c41d473d69fb4a7f36042892a15a2b50a7e /variables.c | |
| parent | 1a1f8b54fb29c2af275253f35a7fcf79815222d5 (diff) | |
| download | android_external_bash-b64a0e1d0b412cedda763a32d6e5cd6927333f02.tar.gz android_external_bash-b64a0e1d0b412cedda763a32d6e5cd6927333f02.tar.bz2 android_external_bash-b64a0e1d0b412cedda763a32d6e5cd6927333f02.zip | |
Bash-4.3 patch 25
Diffstat (limited to 'variables.c')
| -rw-r--r-- | variables.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/variables.c b/variables.c index cdc54bc..92a5a10 100644 --- a/variables.c +++ b/variables.c @@ -358,13 +358,11 @@ initialize_shell_variables (env, privmode) temp_string[char_index] = ' '; strcpy (temp_string + char_index + 1, string); - if (posixly_correct == 0 || legal_identifier (name)) - parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST); - - /* Ancient backwards compatibility. Old versions of bash exported - functions like name()=() {...} */ - if (name[char_index - 1] == ')' && name[char_index - 2] == '(') - name[char_index - 2] = '\0'; + /* Don't import function names that are invalid identifiers from the + environment, though we still allow them to be defined as shell + variables. */ + if (legal_identifier (name)) + parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); if (temp_var = find_function (name)) { @@ -381,10 +379,6 @@ initialize_shell_variables (env, privmode) last_command_exit_value = 1; report_error (_("error importing function definition for `%s'"), name); } - - /* ( */ - if (name[char_index - 1] == ')' && name[char_index - 2] == '\0') - name[char_index - 2] = '('; /* ) */ } #if defined (ARRAY_VARS) # if ARRAY_EXPORT |