Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adopt autoclose_fd_t in exec_job

Browse source
This commit is contained in:
ridiculousfish 2018-09-01 14:25:44 -07:00
parent 274c77cf0c
commit ec9c592edc
1 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/exec.cpp
View file

@ -617,9 +617,7 @@ void exec_job(parser_t &parser, job_t *j) {
// 2. The pipe that the current process should write to // 2. The pipe that the current process should write to
// 3. The pipe that the next process should read from (courtesy of us) // 3. The pipe that the next process should read from (courtesy of us)
// //
// We are careful to set these to -1 when closed, so if we exit the loop abruptly, we can still autoclose_fd_t pipe_current_write, pipe_next_read;
// close them.
int pipe_current_read = -1, pipe_current_write = -1, pipe_next_read = -1;
for (std::unique_ptr<process_t> &unique_p : j->processes) { for (std::unique_ptr<process_t> &unique_p : j->processes) {
if (exec_error) { if (exec_error) {
break; break;
@ -630,9 +628,7 @@ void exec_job(parser_t &parser, job_t *j) {
io_chain_t process_net_io_chain = j->block_io_chain(); io_chain_t process_net_io_chain = j->block_io_chain();
// "Consume" any pipe_next_read by making it current. // "Consume" any pipe_next_read by making it current.
assert(pipe_current_read == -1); autoclose_fd_t pipe_current_read = std::move(pipe_next_read);
pipe_current_read = pipe_next_read;
pipe_next_read = -1;
// See if we need a pipe. // See if we need a pipe.
const bool pipes_to_next_command = !p->is_last_in_job; const bool pipes_to_next_command = !p->is_last_in_job;
@ -686,7 +682,7 @@ void exec_job(parser_t &parser, job_t *j) {
if (!p->is_first_in_job) { if (!p->is_first_in_job) {
pipe_read.reset(new io_pipe_t(p->pipe_read_fd, true)); pipe_read.reset(new io_pipe_t(p->pipe_read_fd, true));
// Record the current read in pipe_read. // Record the current read in pipe_read.
pipe_read->pipe_fd[0] = pipe_current_read; pipe_read->pipe_fd[0] = pipe_current_read.fd();
process_net_io_chain.push_back(pipe_read); process_net_io_chain.push_back(pipe_read);
} }
@ -733,11 +729,11 @@ void exec_job(parser_t &parser, job_t *j) {
// Record our pipes. The fds should be negative to indicate that we aren't overwriting // Record our pipes. The fds should be negative to indicate that we aren't overwriting
// an fd we failed to close. // an fd we failed to close.
assert(pipe_current_write == -1); assert(pipe_current_write.fd() == -1);
pipe_current_write = local_pipe[1]; pipe_current_write.reset(local_pipe[1]);
assert(pipe_next_read == -1); assert(pipe_next_read.fd() == -1);
pipe_next_read = local_pipe[0]; pipe_next_read.reset(local_pipe[0]);
} }
// This is the IO buffer we use for storing the output of a block or function when it is in // This is the IO buffer we use for storing the output of a block or function when it is in
@ -1128,22 +1124,14 @@ void exec_job(parser_t &parser, job_t *j) {
} }
// Close the pipe the current process uses to read from the previous process_t. // Close the pipe the current process uses to read from the previous process_t.
if (pipe_current_read >= 0) {
exec_close(pipe_current_read);
pipe_current_read = -1;
}
// Close the write end too, since the curent child subprocess already has a copy of it. // Close the write end too, since the curent child subprocess already has a copy of it.
if (pipe_current_write >= 0) { pipe_current_read.close();
exec_close(pipe_current_write); pipe_current_write.close();
pipe_current_write = -1;
}
} }
// Clean up any file descriptors we left open. // Clean up any file descriptors we left open.
if (pipe_current_read >= 0) exec_close(pipe_current_read); pipe_current_write.close();
if (pipe_current_write >= 0) exec_close(pipe_current_write); pipe_next_read.close();
if (pipe_next_read >= 0) exec_close(pipe_next_read);
// The keepalive process is no longer needed, so we terminate it with extreme prejudice. // The keepalive process is no longer needed, so we terminate it with extreme prejudice.
if (needs_keepalive) { if (needs_keepalive) {