From 15da6f02032f8bfa6d2af333cf386250ca76d4f5 Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Sat, 29 Jul 2017 13:00:29 -0500 Subject: [PATCH] Minor refactoring --- src/exec.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/exec.cpp b/src/exec.cpp index 761705b80..97669ba6f 100644 --- a/src/exec.cpp +++ b/src/exec.cpp @@ -632,8 +632,8 @@ void exec_job(parser_t &parser, job_t *j) { if (blocked_pid != -1) { debug(2, L"Unblocking process %d.\n", blocked_pid); kill(blocked_pid, SIGCONT); + blocked_pid = -1; } - blocked_pid = -1; }; // This is the io_streams we pass to internal builtins. @@ -1174,15 +1174,13 @@ void exec_job(parser_t &parser, job_t *j) { //no one awaits it. } //regardless of whether the child blocked or not: - if (child_spawned || child_forked) { + //only once per job, and only once we've actually executed an external command + if ((child_spawned || child_forked) && !pgrp_set) { //this should be called after waitpid if child_forked && pipes_to_next_command //it can be called at any time if child_spawned - if (!pgrp_set) { - set_child_group(j, p->pid); - //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; - } + set_child_group(j, p->pid); + //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. //this must be after the wait_pid on the process we just started, if any.