github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-15 15:05:27 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Acquire terminal even if our pgroup is 0

Browse Source 
`tcsetpgrp` still works.

[ci skip]

(This isn't tested)
This commit is contained in:
Fabian Homborg 2018-12-07 21:35:09 +01:00
parent 0a0060481f
commit 88f7d50633
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/proc.cpp
View File

@ -978,10 +978,6 @@ bool terminal_give_to_job(const job_t *j, bool restore_attrs) {
pid_t terminal_acquire_before_builtin(int job_pgid) {
pid_t selfpgid = getpgrp();
if (selfpgid == 0) {
debug(2, L"Not acquiring terminal because we don't have a valid pgroup");
return -1;
}
pid_t current_owner = tcgetpgrp(STDIN_FILENO);
if (current_owner >= 0 && current_owner != selfpgid && current_owner == job_pgid) {
@ -996,7 +992,7 @@ pid_t terminal_acquire_before_builtin(int job_pgid) {
/// so that we can restore the terminal ownership to the job at a later time.
static bool terminal_return_from_job(job_t *j) {
errno = 0;
if (j->pgid == 0 || getpgrp() == 0) {
if (j->pgid == 0) {
debug(2, "terminal_return_from_job() returning early due to no process group");
return true;
}