Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-30 14:53:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up and rename io_transmorgrify

Browse source
This commit is contained in:
ridiculousfish 2019-05-22 16:36:22 -07:00
parent 7915831939
commit 4d929720ce
1 changed files with 14 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/exec.cpp
View file

@ -182,19 +182,14 @@ static void launch_process_nofork(env_stack_t &vars, process_t *p) {
/// Check if the IO redirection chains contains redirections for the specified file descriptor. /// Check if the IO redirection chains contains redirections for the specified file descriptor.
static int has_fd(const io_chain_t &d, int fd) { return io_chain_get(d, fd).get() != NULL; } static int has_fd(const io_chain_t &d, int fd) { return io_chain_get(d, fd).get() != NULL; }
/// Close a list of fds.
static void io_cleanup_fds(const std::vector<int> &opened_fds) {
std::for_each(opened_fds.begin(), opened_fds.end(), close);
}
/// Make a copy of the specified io redirection chain, but change file redirection into fd /// Make a copy of the specified io redirection chain, but change file redirection into fd
/// redirection. This makes the redirection chain suitable for use as block-level io, since the file /// redirection. This makes the redirection chain suitable for use as block-level io, since the file
/// won't be repeatedly reopened for every command in the block, which would reset the cursor /// won't be repeatedly reopened for every command in the block, which would reset the cursor
/// position. /// position.
/// ///
/// \return true on success, false on failure. Returns the output chain and opened_fds by reference. /// \return true on success, false on failure. Returns the output chain and opened_fds by reference.
static bool io_transmogrify(const io_chain_t &in_chain, io_chain_t *out_chain, static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, io_chain_t *out_chain,
std::vector<int> *out_opened_fds) { std::vector<autoclose_fd_t> *out_opened_fds) {
ASSERT_IS_MAIN_THREAD(); ASSERT_IS_MAIN_THREAD();
assert(out_chain != NULL && out_opened_fds != NULL); assert(out_chain != NULL && out_opened_fds != NULL);
assert(out_chain->empty()); assert(out_chain->empty());
@ -206,58 +201,45 @@ static bool io_transmogrify(const io_chain_t &in_chain, io_chain_t *out_chain,
bool success = true; bool success = true;
// All of the FDs that we create.
std::vector<autoclose_fd_t> opened_fds{};
// Make our chain of redirections. // Make our chain of redirections.
io_chain_t result_chain; io_chain_t result_chain;
// In the event we can't finish transmorgrifying, we'll have to close all the files we opened. for (const shared_ptr<io_data_t> &in : in_chain) {
std::vector<int> opened_fds;
for (size_t idx = 0; idx < in_chain.size(); idx++) {
const shared_ptr<io_data_t> &in = in_chain.at(idx);
shared_ptr<io_data_t> out; // gets allocated via new
switch (in->io_mode) { switch (in->io_mode) {
case io_mode_t::pipe: case io_mode_t::pipe:
case io_mode_t::bufferfill: case io_mode_t::bufferfill:
case io_mode_t::fd: case io_mode_t::fd:
case io_mode_t::close: { case io_mode_t::close: {
// These redirections don't need transmogrification. They can be passed through. result_chain.push_back(in);
out = in;
break; break;
} }
case io_mode_t::file: { case io_mode_t::file: {
// Transmogrify file redirections. // We have a path-based redireciton. Resolve it to a file.
int fd;
io_file_t *in_file = static_cast<io_file_t *>(in.get()); io_file_t *in_file = static_cast<io_file_t *>(in.get());
if ((fd = open(in_file->filename_cstr, in_file->flags, OPEN_MASK)) == -1) { int fd = open(in_file->filename_cstr, in_file->flags, OPEN_MASK);
if (fd < 0) {
debug(1, FILE_ERROR, in_file->filename_cstr); debug(1, FILE_ERROR, in_file->filename_cstr);
wperror(L"open"); wperror(L"open");
success = false; success = false;
break; break;
} }
opened_fds.push_back(fd); opened_fds.push_back(autoclose_fd_t(fd));
out.reset(new io_fd_t(in->fd, fd, false)); result_chain.push_back(std::make_shared<io_fd_t>(in->fd, fd, false));
break; break;
} }
} }
if (out.get() != NULL) result_chain.push_back(out);
// Don't go any further if we failed.
if (!success) { if (!success) {
break; break;
} }
} }
// Now either return success, or clean up.
if (success) { if (success) {
*out_chain = std::move(result_chain); *out_chain = std::move(result_chain);
*out_opened_fds = std::move(opened_fds); *out_opened_fds = std::move(opened_fds);
} else {
result_chain.clear();
io_cleanup_fds(opened_fds);
} }
return success; return success;
} }
@ -274,11 +256,8 @@ void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, t
assert(parsed_source && node && "exec_helper missing source or without node"); assert(parsed_source && node && "exec_helper missing source or without node");
io_chain_t morphed_chain; io_chain_t morphed_chain;
std::vector<int> opened_fds; std::vector<autoclose_fd_t> opened_fds;
bool transmorgrified = io_transmogrify(ios, &morphed_chain, &opened_fds); if (!resolve_file_redirections_to_fds(ios, &morphed_chain, &opened_fds)) {
// Did the transmogrification fail - if so, set error status and return.
if (!transmorgrified) {
parser.set_last_statuses(statuses_t::just(STATUS_EXEC_FAIL)); parser.set_last_statuses(statuses_t::just(STATUS_EXEC_FAIL));
return; return;
} }
@ -286,7 +265,6 @@ void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, t
parser.eval_node(parsed_source, node, morphed_chain, TOP, parent_job); parser.eval_node(parsed_source, node, morphed_chain, TOP, parent_job);
morphed_chain.clear(); morphed_chain.clear();
io_cleanup_fds(opened_fds);
job_reap(parser, false); job_reap(parser, false);
} }