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

Sprinkle in some job control asserts

Browse source
This commit is contained in:
Mahmoud Al-Qudsi 2018-03-04 20:17:26 -06:00
parent 71329a250b
commit 912dbd85d8
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/postfork.cpp
View file

@ -106,6 +106,8 @@ bool child_set_group(job_t *j, process_t *p) {
/// if it's to run in the foreground. /// if it's to run in the foreground.
bool set_child_group(job_t *j, pid_t child_pid) { bool set_child_group(job_t *j, pid_t child_pid) {
if (j->get_flag(JOB_CONTROL)) { if (j->get_flag(JOB_CONTROL)) {
assert (j->pgid != -2 && "set_child_group called with JOB_CONTROL before job pgid determined!");
// The parent sets the child's group. This incurs the well-known unavoidable race with the // The parent sets the child's group. This incurs the well-known unavoidable race with the
// child exiting, so ignore ESRCH and EPERM (in case the pid was recycled). // child exiting, so ignore ESRCH and EPERM (in case the pid was recycled).
if (setpgid(child_pid, j->pgid) < 0) { if (setpgid(child_pid, j->pgid) < 0) {
@ -122,6 +124,8 @@ bool set_child_group(job_t *j, pid_t child_pid) {
} }
bool maybe_assign_terminal(job_t *j) { bool maybe_assign_terminal(job_t *j) {
assert(j->pgid > 1 && "maybe_assign_terminal() called on job with invalid pgid!");
if (j->get_flag(JOB_TERMINAL) && j->get_flag(JOB_FOREGROUND)) { //!OCLINT(early exit) if (j->get_flag(JOB_TERMINAL) && j->get_flag(JOB_FOREGROUND)) { //!OCLINT(early exit)
if (tcgetpgrp(STDIN_FILENO) == j->pgid) { if (tcgetpgrp(STDIN_FILENO) == j->pgid) {
// We've already assigned the process group control of the terminal when the first // We've already assigned the process group control of the terminal when the first