Skip to content

Commit

Permalink
Revert "Fix SIGTTIN handling" (#9694)
Browse files Browse the repository at this point in the history
Reverts #9681

As mentioned in #9681 - this breaks running tests in wsl2.
  • Loading branch information
sophiajt committed Jul 15, 2023
1 parent 3ffafa7 commit b693db1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/terminal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,12 @@ fn take_control(interactive: bool) {
}
}

let mut success = false;
for _ in 0..4096 {
match unistd::tcgetpgrp(nix::libc::STDIN_FILENO) {
Ok(owner_pgid) if owner_pgid == shell_pgid => {
// success
return;
success = true;
break;
}
Ok(owner_pgid) if owner_pgid == Pid::from_raw(0) => {
// Zero basically means something like "not owned" and we can just take it
Expand All @@ -79,7 +80,7 @@ fn take_control(interactive: bool) {
}
_ => {
// fish also has other heuristics than "too many attempts" for the orphan check, but they're optional
if signal::killpg(shell_pgid, Signal::SIGTTIN).is_err() {
if signal::killpg(Pid::from_raw(-shell_pgid.as_raw()), Signal::SIGTTIN).is_err() {
if !interactive {
// that's fine
return;
Expand All @@ -90,8 +91,7 @@ fn take_control(interactive: bool) {
}
}
}

if interactive {
if !success && interactive {
eprintln!("ERROR: failed take control of the terminal, we might be orphaned");
std::process::exit(1);
}
Expand Down

0 comments on commit b693db1

Please sign in to comment.