github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 09:39:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "Set child process group in case of posix_spawn"

Browse Source 
This reverts commit 9f2addcf27.
It was meant for the major branch.
This commit is contained in:
Kurtis Rader 2017-08-13 15:28:38 -07:00
parent 9af7720f19
commit 8d53b72e46
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/exec.cpp
View File

@ -515,7 +515,6 @@ void exec_job(parser_t &parser, job_t *j) {
const bool pipes_to_next_command = !p->is_last_in_job;
//set to true if we end up forking for this process
bool child_forked = false;
bool child_spawned = false;
// The pipes the current process write to and read from. Unfortunately these can't be just
// allocated on the stack, since j->io wants shared_ptr.
@ -1093,9 +1092,6 @@ void exec_job(parser_t &parser, job_t *j) {
job_mark_process_as_failed(j, p);
exec_error = true;
}
else {
child_spawned = true;
}
} else
#endif
{
@ -1137,11 +1133,7 @@ void exec_job(parser_t &parser, job_t *j) {
}
}
if (child_spawned) {
child_set_group(j, p);
set_child_group(j, p->pid);
}
else if (child_forked) {
if (child_forked) {
//we have to wait to ensure the child has set their progress group and is in SIGSTOP state
//otherwise, we can later call SIGCONT before they call SIGSTOP and they'll be blocked indefinitely.
pid_t pid_status{};