h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-31 20:31:19 -03:00
Code Issues Packages Projects Releases Wiki Activity

exec_internal_builtin_proc to stop returning failure

Browse Source 
Now that closing stdin is no longer an error for builtins, the function
exec_internal_builtin_proc cannot fail. Make it return void instead.
This commit is contained in:
ridiculousfish
2021-02-10 17:32:05 -08:00
parent 84d59accfc
commit 17d6aa054b
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/exec.cpp
View File

@@ -377,9 +377,8 @@ static launch_result_t fork_child_for_process(const std::shared_ptr<job_t> &job,
/// Execute an internal builtin. Given a parser and a builtin process, execute the builtin with the /// Execute an internal builtin. Given a parser and a builtin process, execute the builtin with the
/// given streams. Infer stdin from the IO chain. An error return here indicates that the process /// given streams. Infer stdin from the IO chain. An error return here indicates that the process
/// failed to launch, and the rest of the pipeline should be cancelled. /// failed to launch, and the rest of the pipeline should be cancelled.
static launch_result_t exec_internal_builtin_proc(parser_t &parser, process_t *p, static void exec_internal_builtin_proc(parser_t &parser, process_t *p,
const io_chain_t &proc_io_chain, const io_chain_t &proc_io_chain, io_streams_t &streams) {
io_streams_t &streams) {
assert(p->type == process_type_t::builtin && "Process must be a builtin"); assert(p->type == process_type_t::builtin && "Process must be a builtin");
int local_builtin_stdin = STDIN_FILENO; int local_builtin_stdin = STDIN_FILENO;
@@ -425,9 +424,8 @@ static launch_result_t exec_internal_builtin_proc(parser_t &parser, process_t *p
streams.stdin_is_directly_redirected = stdin_is_directly_redirected; streams.stdin_is_directly_redirected = stdin_is_directly_redirected;
streams.io_chain = &proc_io_chain; streams.io_chain = &proc_io_chain;
// Note this call may block for a long time, while the builtin performs I/O. // Note this call may block for a long time while the builtin runs.
p->status = builtin_run(parser, p->get_argv(), streams); p->status = builtin_run(parser, p->get_argv(), streams);
return launch_result_t::ok;
} }
/// \return an newly allocated output stream for the given fd, which is typically stdout or stderr. /// \return an newly allocated output stream for the given fd, which is typically stdout or stderr.
@@ -827,10 +825,7 @@ static launch_result_t exec_process_in_job(parser_t &parser, process_t *p,
io_streams_t builtin_io_streams{*output_stream, *errput_stream}; io_streams_t builtin_io_streams{*output_stream, *errput_stream};
builtin_io_streams.job_group = j->group; builtin_io_streams.job_group = j->group;
if (exec_internal_builtin_proc(parser, p, process_net_io_chain, builtin_io_streams) == exec_internal_builtin_proc(parser, p, process_net_io_chain, builtin_io_streams);
launch_result_t::failed) {
return launch_result_t::failed;
}
handle_builtin_output(parser, j, p, &process_net_io_chain, builtin_io_streams); handle_builtin_output(parser, j, p, &process_net_io_chain, builtin_io_streams);
break; break;
} }