Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 14:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Minor refactoring"

Browse source 
This reverts commit 15da6f0203.
It was meant for the major branch.
This commit is contained in:
Kurtis Rader 2017-08-13 15:26:03 -07:00
parent a4593d011a
commit d0ce2b4824
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/exec.cpp
View file

@ -632,8 +632,8 @@ void exec_job(parser_t &parser, job_t *j) {
if (blocked_pid != -1) { if (blocked_pid != -1) {
debug(2, L"Unblocking process %d.\n", blocked_pid); debug(2, L"Unblocking process %d.\n", blocked_pid);
kill(blocked_pid, SIGCONT); kill(blocked_pid, SIGCONT);
blocked_pid = -1;
} }
blocked_pid = -1;
}; };
// This is the io_streams we pass to internal builtins. // This is the io_streams we pass to internal builtins.
@ -1174,13 +1174,15 @@ void exec_job(parser_t &parser, job_t *j) {
//no one awaits it. //no one awaits it.
} }
//regardless of whether the child blocked or not: //regardless of whether the child blocked or not:
//only once per job, and only once we've actually executed an external command if (child_spawned || child_forked) {
if ((child_spawned || child_forked) && !pgrp_set) {
//this should be called after waitpid if child_forked && pipes_to_next_command //this should be called after waitpid if child_forked && pipes_to_next_command
//it can be called at any time if child_spawned //it can be called at any time if child_spawned
set_child_group(j, p->pid); if (!pgrp_set) {
//we can't rely on p->is_first_in_job because a builtin may have been the first set_child_group(j, p->pid);
pgrp_set = true; //only once per job, and only once we've executed an external command for real
//we can't rely on p->is_first_in_job because a builtin may have been the first
pgrp_set = true;
}
} }
//if the command we ran _before_ this one was SIGSTOP'd to let this one catch up, unblock it now. //if the command we ran _before_ this one was SIGSTOP'd to let this one catch up, unblock it now.
//this must be after the wait_pid on the process we just started, if any. //this must be after the wait_pid on the process we just started, if any.