Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-16 15:04:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

run_internal_process can no longer fail, remove its bool return

Browse source
This commit is contained in:
ridiculousfish 2020-01-13 14:40:24 -08:00
parent 1efa641105
commit fe4f7fea5c
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/exec.cpp
View file

@ -237,7 +237,7 @@ static void on_process_created(const std::shared_ptr<job_t> &j, pid_t child_pid)
/// stdout and \p errdata to stderr, respecting the io chain \p ios. For example if target_fd is 1 /// stdout and \p errdata to stderr, respecting the io chain \p ios. For example if target_fd is 1
/// (stdout), and there is a dup2 3->1, then we need to write to fd 3. Then exit the internal /// (stdout), and there is a dup2 3->1, then we need to write to fd 3. Then exit the internal
/// process. /// process.
static bool run_internal_process(process_t *p, std::string outdata, std::string errdata, static void run_internal_process(process_t *p, std::string outdata, std::string errdata,
const io_chain_t &ios) { const io_chain_t &ios) {
p->check_generations_before_launch(); p->check_generations_before_launch();
@ -289,7 +289,7 @@ static bool run_internal_process(process_t *p, std::string outdata, std::string
// TODO: support eliding output to /dev/null. // TODO: support eliding output to /dev/null.
if (f->skip_out() && f->skip_err()) { if (f->skip_out() && f->skip_err()) {
f->internal_proc->mark_exited(p->status); f->internal_proc->mark_exited(p->status);
return true; return;
} }
// Ensure that ios stays alive, it may own fds. // Ensure that ios stays alive, it may own fds.
@ -326,7 +326,6 @@ static bool run_internal_process(process_t *p, std::string outdata, std::string
} }
f->internal_proc->mark_exited(status); f->internal_proc->mark_exited(status);
}); });
return true;
} }
/// Call fork() as part of executing a process \p p in a job \j. Execute \p child_action in the /// Call fork() as part of executing a process \p p in a job \j. Execute \p child_action in the
@ -515,11 +514,11 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
j->job_id(), j->preview().c_str(), p->status); j->job_id(), j->preview().c_str(), p->status);
parser.set_last_statuses(j->get_statuses()); parser.set_last_statuses(j->get_statuses());
} }
return true;
} else { } else {
// Construct and run our background process. // Construct and run our background process.
return run_internal_process(p, std::move(outbuff), std::move(errbuff), *io_chain); run_internal_process(p, std::move(outbuff), std::move(errbuff), *io_chain);
} }
return true;
} }
/// Executes an external command. /// Executes an external command.
@ -793,7 +792,7 @@ static bool exec_block_or_func_process(parser_t &parser, const std::shared_ptr<j
} }
if (!buffer_contents.empty()) { if (!buffer_contents.empty()) {
return run_internal_process(p, std::move(buffer_contents), {} /*errdata*/, io_chain); run_internal_process(p, std::move(buffer_contents), {} /*errdata*/, io_chain);
} else { } else {
if (p->is_last_in_job) { if (p->is_last_in_job) {
parser.set_last_statuses(j->get_statuses()); parser.set_last_statuses(j->get_statuses());