diff options
| author | Jari Aalto <jari.aalto@cante.net> | 2008-11-18 13:15:12 +0000 |
|---|---|---|
| committer | Jari Aalto <jari.aalto@cante.net> | 2009-09-12 16:46:59 +0000 |
| commit | f1be666c7d78939ad775078d290bec2758fa29a2 (patch) | |
| tree | 4f4b8ed6eb250653e0bb44685eb5ffa9d3805e91 /expr.c | |
| parent | 0628567a28f3510f506ae46cb9b24b73a6d2dc5d (diff) | |
| download | android_external_bash-f1be666c7d78939ad775078d290bec2758fa29a2.tar.gz android_external_bash-f1be666c7d78939ad775078d290bec2758fa29a2.tar.bz2 android_external_bash-f1be666c7d78939ad775078d290bec2758fa29a2.zip | |
Imported from ../bash-3.2.48.tar.gz.
Diffstat (limited to 'expr.c')
| -rw-r--r-- | expr.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -286,6 +286,8 @@ expr_unwind () free (expr_stack[expr_depth]); } free (expr_stack[expr_depth]); /* free the allocated EXPR_CONTEXT */ + + noeval = 0; /* XXX */ } static void @@ -319,6 +321,7 @@ evalexp (expr, validp) procenv_t oevalbuf; val = 0; + noeval = 0; FASTCOPY (evalbuf, oevalbuf, sizeof (evalbuf)); @@ -517,7 +520,8 @@ expcond () set_noeval = 1; noeval++; } - val2 = explor (); + + val2 = expcond (); if (set_noeval) noeval--; rval = cval ? val1 : val2; @@ -929,6 +933,7 @@ expr_streval (tok, e) if (interactive_shell) { expr_unwind (); + top_level_cleanup (); jump_to_top_level (DISCARD); } else |