diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2013-08-18 16:55:01 -0700 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-08-19 18:06:24 -0700 |
commit | e849beabbab31c83ac57693cb0a7ac1e58f8cfd5 (patch) | |
tree | fa8872516ac378bd32ef3be5844100bc64cf4c1b /parser.cpp | |
parent | 2979d3bf169f51fb2ba218897994745754f830f9 (diff) |
Initial work towards various IO cleanups with an eye to fixing https://github.com/fish-shell/fish-shell/issues/110
Diffstat (limited to 'parser.cpp')
-rw-r--r-- | parser.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1559,7 +1559,7 @@ void parser_t::parse_job_argument_list(process_t *p, if (new_io.get() != NULL) { - j->io.push_back(new_io); + j->append_io(new_io); } } @@ -2318,7 +2318,6 @@ static bool job_should_skip_elseif(const job_t *job, const block_t *current_bloc void parser_t::eval_job(tokenizer_t *tok) { ASSERT_IS_MAIN_THREAD(); - job_t *j; int start_pos = job_start_pos = tok_get_pos(tok); long long t1=0, t2=0, t3=0; @@ -2341,7 +2340,7 @@ void parser_t::eval_job(tokenizer_t *tok) { case TOK_STRING: { - j = this->job_create(); + job_t *j = this->job_create(); job_set_flag(j, JOB_FOREGROUND, 1); job_set_flag(j, JOB_TERMINAL, job_get_flag(j, JOB_CONTROL)); job_set_flag(j, JOB_TERMINAL, job_get_flag(j, JOB_CONTROL) \ |