github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-21 08:56:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename launch process to exec_process_in_job

Browse Source 
This avoids a name collision with another launch_process
This commit is contained in:
ridiculousfish 2018-09-03 11:18:39 -07:00
parent 48c510572b
commit f7a020ad33
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/exec.cpp
View File

@ -510,12 +510,13 @@ void on_process_created(job_t *j, pid_t child_pid) {
}
}
/// Launches a process \p in job \j, using the read pipe \p pipe_current_read.
/// If the process pipes to a command, the read end of the created pipe is returned in out_pipe_next_read.
/// \returns true on success, false on exec error.
static bool launch_process(parser_t &parser, process_t *p, job_t *j,
autoclose_fd_t pipe_current_read, autoclose_fd_t *out_pipe_next_read,
const io_chain_t &all_ios, size_t stdout_read_limit) {
/// Executes a process \p in job \j, using the read pipe \p pipe_current_read.
/// If the process pipes to a command, the read end of the created pipe is returned in
/// out_pipe_next_read. \returns true on success, false on exec error.
static bool exec_process_in_job(parser_t &parser, process_t *p, job_t *j,
autoclose_fd_t pipe_current_read,
autoclose_fd_t *out_pipe_next_read, const io_chain_t &all_ios,
size_t stdout_read_limit) {
bool exec_error = false;
// The IO chain for this process. It starts with the block IO, then pipes, and then gets any
@ -1122,8 +1123,8 @@ void exec_job(parser_t &parser, job_t *j) {
autoclose_fd_t pipe_next_read;
for (std::unique_ptr<process_t> &unique_p : j->processes) {
autoclose_fd_t current_read = std::move(pipe_next_read);
if (!launch_process(parser, unique_p.get(), j, std::move(current_read), &pipe_next_read,
all_ios, stdout_read_limit)) {
if (!exec_process_in_job(parser, unique_p.get(), j, std::move(current_read),
&pipe_next_read, all_ios, stdout_read_limit)) {
exec_error = true;
break;
}