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

create_output_stream_for_builtin to accept read limit directly

Browse source 
This avoids requiring passing in a parser.
This commit is contained in:
ridiculousfish 2021-02-03 19:00:04 -08:00
parent 3eef295990
commit 7e2a538300
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/exec.cpp
View file

@ -441,7 +441,7 @@ static launch_result_t exec_internal_builtin_proc(parser_t &parser, process_t *p
/// \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.
/// This inspects the io_chain and decides what sort of output stream to return. /// This inspects the io_chain and decides what sort of output stream to return.
static std::unique_ptr<output_stream_t> create_output_stream_for_builtin(const parser_t &parser, static std::unique_ptr<output_stream_t> create_output_stream_for_builtin(size_t read_limit,
const io_chain_t &io_chain, const io_chain_t &io_chain,
int fd) { int fd) {
const shared_ptr<const io_data_t> io = io_chain.io_for_fd(fd); const shared_ptr<const io_data_t> io = io_chain.io_for_fd(fd);
@ -453,7 +453,7 @@ static std::unique_ptr<output_stream_t> create_output_stream_for_builtin(const p
switch (io->io_mode) { switch (io->io_mode) {
case io_mode_t::bufferfill: case io_mode_t::bufferfill:
// Write to a buffer. // Write to a buffer.
return make_unique<buffered_output_stream_t>(parser.libdata().read_limit); return make_unique<buffered_output_stream_t>(read_limit);
case io_mode_t::close: case io_mode_t::close:
return make_unique<null_output_stream_t>(); return make_unique<null_output_stream_t>();
@ -462,7 +462,7 @@ static std::unique_ptr<output_stream_t> create_output_stream_for_builtin(const p
case io_mode_t::file: case io_mode_t::file:
case io_mode_t::pipe: case io_mode_t::pipe:
case io_mode_t::fd: case io_mode_t::fd:
return make_unique<buffered_output_stream_t>(parser.libdata().read_limit); return make_unique<buffered_output_stream_t>(read_limit);
} }
DIE("Unreachable"); DIE("Unreachable");
} }
@ -863,10 +863,11 @@ static launch_result_t exec_process_in_job(parser_t &parser, process_t *p,
} }
case process_type_t::builtin: { case process_type_t::builtin: {
size_t read_limit = parser.libdata().read_limit;
std::unique_ptr<output_stream_t> output_stream = std::unique_ptr<output_stream_t> output_stream =
create_output_stream_for_builtin(parser, process_net_io_chain, STDOUT_FILENO); create_output_stream_for_builtin(read_limit, process_net_io_chain, STDOUT_FILENO);
std::unique_ptr<output_stream_t> errput_stream = std::unique_ptr<output_stream_t> errput_stream =
create_output_stream_for_builtin(parser, process_net_io_chain, STDERR_FILENO); create_output_stream_for_builtin(read_limit, process_net_io_chain, STDERR_FILENO);
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;