aboutsummaryrefslogtreecommitdiffhomepage
path: root/parser.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-12-29 16:23:26 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-12-29 16:23:26 -0800
commita9787b769fce4327be5db4f361fb47208d4f79d1 (patch)
treeb71139c1669cb964350ae7b863bfdb14b89c9e86 /parser.cpp
parenta42711e31cdb41e3c504ed161c07e56698d29e7a (diff)
Support for implicit cd, no-exec, and the exit builtin. All tests now
pass (!). Error reporting still unsteady.
Diffstat (limited to 'parser.cpp')
-rw-r--r--parser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/parser.cpp b/parser.cpp
index bd0471df..6b7d1909 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -2740,7 +2740,7 @@ int parser_t::eval(const wcstring &cmd_str, const io_chain_t &io, enum block_typ
while (tok_has_next(current_tokenizer) &&
!error_code &&
!sanity_check() &&
- !exit_status())
+ !shell_is_exiting())
{
this->eval_job(current_tokenizer);
event_fire(NULL);
@@ -2759,7 +2759,7 @@ int parser_t::eval(const wcstring &cmd_str, const io_chain_t &io, enum block_typ
break;
}
- if ((!error_code) && (!exit_status()) && (!proc_get_last_status()))
+ if ((!error_code) && (!shell_is_exiting()) && (!proc_get_last_status()))
{
//debug( 2, L"Status %d\n", proc_get_last_status() );