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

Remove some functions which were rendered trivial by xiaq's changes. Make io_file_t take its path directly. Make io_buffer_t no longer use a shared_ptr for its data.

Browse Source
This commit is contained in:
ridiculousfish
2013-01-19 10:59:43 -08:00
parent f850c021b7
commit 98a17f4046
5 changed files with 18 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
exec.cpp
View File

@@ -332,20 +332,11 @@ static int has_fd(const io_chain_t &d, int fd)
}
/**
Free a transmogrified io chain. Only the chain itself and resources
used by a transmogrified IO_FILE redirection are freed, since the
original chain may still be needed.
Close a list of fds.
*/
static void io_cleanup_chains(io_chain_t &chains, const std::vector<int> &opened_fds)
static void io_cleanup_fds(const std::vector<int> &opened_fds)
{
/* Close all the fds */
for (size_t idx = 0; idx < opened_fds.size(); idx++)
{
close(opened_fds.at(idx));
}
/* Then delete all of the redirections we made */
chains.destroy();
std::for_each(opened_fds.begin(), opened_fds.end(), close);
}
/**
@@ -446,7 +437,8 @@ static bool io_transmogrify(const io_chain_t &in_chain, io_chain_t &out_chain, s
else
{
/* No dice - clean up */
io_cleanup_chains(result_chain, opened_fds);
result_chain.clear();
io_cleanup_fds(opened_fds);
}
return success;
}
@@ -488,7 +480,8 @@ static void internal_exec_helper(parser_t &parser,
signal_block();
io_cleanup_chains(morphed_chain, opened_fds);
morphed_chain.clear();
io_cleanup_fds(opened_fds);
job_reap(0);
is_block=is_block_old;
}
@@ -563,7 +556,7 @@ void exec(parser_t &parser, job_t *j)
if (! parser.block_io.empty())
{
io_duplicate_prepend(parser.block_io, j->io);
j->io.insert(j->io.begin(), parser.block_io.begin(), parser.block_io.end());
}
const io_buffer_t *input_redirect = 0;