aboutsummaryrefslogtreecommitdiffstats
path: root/variables.c
diff options
context:
space:
mode:
authorJari Aalto <jari.aalto@cante.net>2004-11-09 21:37:25 +0000
committerJari Aalto <jari.aalto@cante.net>2009-09-12 16:46:57 +0000
commiteb87367179effbe5f430236db8259006d71438b7 (patch)
tree012cd9de789fea49510f8e25118acf2be9bfa2ed /variables.c
parentb80f6443b6b7b620c7272664c66ecb0b120a0998 (diff)
downloadandroid_external_bash-eb87367179effbe5f430236db8259006d71438b7.tar.gz
android_external_bash-eb87367179effbe5f430236db8259006d71438b7.tar.bz2
android_external_bash-eb87367179effbe5f430236db8259006d71438b7.zip
Imported from ../bash-3.0.16.tar.gz.
Diffstat (limited to 'variables.c')
-rw-r--r--variables.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/variables.c b/variables.c
index dc876de..024c05f 100644
--- a/variables.c
+++ b/variables.c
@@ -1419,11 +1419,11 @@ initialize_dynamic_variables ()
v = init_dynamic_array_var ("GROUPS", get_groupset, null_array_assign, att_noassign);
# if defined (DEBUGGER)
- v = init_dynamic_array_var ("BASH_ARGC", get_self, null_array_assign, (att_invisible|att_noassign));
- v = init_dynamic_array_var ("BASH_ARGV", get_self, null_array_assign, (att_invisible|att_noassign));
+ v = init_dynamic_array_var ("BASH_ARGC", get_self, null_array_assign, att_noassign);
+ v = init_dynamic_array_var ("BASH_ARGV", get_self, null_array_assign, att_noassign);
# endif /* DEBUGGER */
- v = init_dynamic_array_var ("BASH_SOURCE", get_self, null_array_assign, (att_invisible|att_noassign));
- v = init_dynamic_array_var ("BASH_LINENO", get_self, null_array_assign, (att_invisible|att_noassign));
+ v = init_dynamic_array_var ("BASH_SOURCE", get_self, null_array_assign, att_noassign);
+ v = init_dynamic_array_var ("BASH_LINENO", get_self, null_array_assign, att_noassign);
#endif
v = init_funcname_var ();
@@ -1599,7 +1599,10 @@ make_local_variable (name)
/* local foo; local foo; is a no-op. */
old_var = find_variable (name);
if (old_var && local_p (old_var) && old_var->context == variable_context)
- return (old_var);
+ {
+ VUNSETATTR (old_var, att_invisible);
+ return (old_var);
+ }
was_tmpvar = old_var && tempvar_p (old_var);
if (was_tmpvar)