aboutsummaryrefslogtreecommitdiffstats
path: root/eval.c
diff options
context:
space:
mode:
authorJari Aalto <jari.aalto@cante.net>2002-07-17 14:10:11 +0000
committerJari Aalto <jari.aalto@cante.net>2009-09-12 16:46:55 +0000
commit7117c2d221b2aed4ede8600f6a36b7c1454b4f55 (patch)
treeb792f26ecca68813c51ed5ba2e381790758ef31b /eval.c
parentf73dda092b33638d2d5e9c35375f687a607b5403 (diff)
downloadandroid_external_bash-7117c2d221b2aed4ede8600f6a36b7c1454b4f55.tar.gz
android_external_bash-7117c2d221b2aed4ede8600f6a36b7c1454b4f55.tar.bz2
android_external_bash-7117c2d221b2aed4ede8600f6a36b7c1454b4f55.zip
Imported from ../bash-2.05b.tar.gz.
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/eval.c b/eval.c
index b9572b9..9908f22 100644
--- a/eval.c
+++ b/eval.c
@@ -52,6 +52,9 @@ extern int need_here_doc;
extern int current_command_number, current_command_line_count, line_number;
extern int expand_aliases;
+static void send_pwd_to_eterm __P((void));
+static sighandler alrm_catcher __P((int));
+
/* Read and execute commands until EOF is reached. This assumes that
the input source has already been initialized. */
int
@@ -114,7 +117,8 @@ reader_loop ()
}
executing = 0;
- dispose_used_env_vars ();
+ if (temporary_env)
+ dispose_used_env_vars ();
#if (defined (ultrix) && defined (mips)) || defined (C_ALLOCA)
/* Attempt to reclaim memory allocated with alloca (). */
@@ -240,9 +244,9 @@ read_command ()
{
tmout_var = find_variable ("TMOUT");
- if (tmout_var && tmout_var->value)
+ if (tmout_var && var_isset (tmout_var))
{
- tmout_len = atoi (tmout_var->value);
+ tmout_len = atoi (value_cell (tmout_var));
if (tmout_len > 0)
{
old_alrm = set_signal_handler (SIGALRM, alrm_catcher);