github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-21 02:54:17 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rationalize a bit of how failed exec() works

Browse Source 
We don't need to mark the job as completed in this case, because the
caller will remove the job.
This commit is contained in:
ridiculousfish 2020-01-13 14:18:43 -08:00
parent 8d598dcffc
commit 399062c219
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/exec.cpp
View File

@ -193,7 +193,7 @@ static bool can_use_posix_spawn_for_job(const std::shared_ptr<job_t> &job,
return true;
}
void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_io) {
static void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_io) {
// Do a regular launch - but without forking first...
process_t *p = j->processes.front().get();
io_chain_t all_ios = block_io;
@ -203,7 +203,7 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_io) {
// child_setup_process makes sure signals are properly set up.
dup2_list_t redirs = dup2_list_t::resolve_chain(all_ios);
if (!child_setup_process(INVALID_PID, false, redirs)) {
if (child_setup_process(INVALID_PID, false, redirs) == 0) {
// Decrement SHLVL as we're removing ourselves from the shell "stack".
auto shlvl_var = vars.get(L"SHLVL", ENV_GLOBAL | ENV_EXPORT);
wcstring shlvl_str = L"0";
@ -217,10 +217,6 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_io) {
// launch_process _never_ returns.
launch_process_nofork(vars, p);
} else {
j->mark_constructed();
j->processes.front()->completed = true;
return;
}
}
@ -1049,8 +1045,10 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
internal_exec(parser.vars(), j.get(), lineage.block_io);
// internal_exec only returns if it failed to set up redirections.
// In case of an successful exec, this code is not reached.
bool status = !j->flags().negate;
int status = j->flags().negate ? 0 : 1;
parser.set_last_statuses(statuses_t::just(status));
// A false return tells the caller to remove the job from the list.
return false;
}
cleanup_t timer = push_timer(j->flags().has_time_prefix);