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

Handle being launched with control of the tty, but not in own pgroup

Browse source 
It is apparently possible to launch fish such that its pid owns the tty,
but its pid is in a different pgroup. In that case, do not attempt to stop
with SIGTTIN; instead simply attempt to place fish in its own pgroup.

Fixes #7388
This commit is contained in:
ridiculousfish 2020-10-18 14:37:31 -07:00
parent 943cf03d8e
commit bbbbe00c81
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/reader.cpp
View file

@ -2000,7 +2000,16 @@ static void acquire_tty_or_exit(pid_t shell_pgid) {
// Check if we are in control of the terminal, so that we don't do semi-expensive things like // Check if we are in control of the terminal, so that we don't do semi-expensive things like
// reset signal handlers unless we really have to, which we often don't. // reset signal handlers unless we really have to, which we often don't.
// Common case. // Common case.
if (tcgetpgrp(STDIN_FILENO) == shell_pgid) { pid_t owner = tcgetpgrp(STDIN_FILENO);
if (owner == shell_pgid) {
return;
}
// In some strange cases the tty may be come preassigned to fish's pid, but not its pgroup.
// In that case we simply attempt to claim our own pgroup.
// See #7388.
if (owner == getpid()) {
(void)setpgid(owner, owner);
return; return;
} }
@ -2023,7 +2032,7 @@ static void acquire_tty_or_exit(pid_t shell_pgid) {
// harder, because it may succeed or block. So we loop for a while, trying those strategies. // harder, because it may succeed or block. So we loop for a while, trying those strategies.
// Eventually we just give up and assume we're orphaend. // Eventually we just give up and assume we're orphaend.
for (unsigned loop_count = 0;; loop_count++) { for (unsigned loop_count = 0;; loop_count++) {
pid_t owner = tcgetpgrp(STDIN_FILENO); owner = tcgetpgrp(STDIN_FILENO);
// 0 is a valid return code from `tcgetpgrp()` under at least FreeBSD and testing // 0 is a valid return code from `tcgetpgrp()` under at least FreeBSD and testing
// indicates that a subsequent call to `tcsetpgrp()` will succeed. 0 is the // indicates that a subsequent call to `tcsetpgrp()` will succeed. 0 is the
// pid of the top-level kernel process, so I'm not sure if this means ownership // pid of the top-level kernel process, so I'm not sure if this means ownership