holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix SIGTTIN handling" (#9694)

Browse Source 
Reverts nushell/nushell#9681

As mentioned in #9681 - this breaks running tests in wsl2.
This commit is contained in:
JT 2023-07-15 15:30:29 +12:00 committed by GitHub
parent 3ffafa7196
commit b693db16cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/terminal.rs
View File

@ -59,11 +59,12 @@ fn take_control(interactive: bool) {
} }
} }
let mut success = false;
for _ in 0..4096 { for _ in 0..4096 {
match unistd::tcgetpgrp(nix::libc::STDIN_FILENO) { match unistd::tcgetpgrp(nix::libc::STDIN_FILENO) {
Ok(owner_pgid) if owner_pgid == shell_pgid => { Ok(owner_pgid) if owner_pgid == shell_pgid => {
// success success = true;
return; break;
} }
Ok(owner_pgid) if owner_pgid == Pid::from_raw(0) => { Ok(owner_pgid) if owner_pgid == Pid::from_raw(0) => {
// Zero basically means something like "not owned" and we can just take it // Zero basically means something like "not owned" and we can just take it
@ -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 // 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 { if !interactive {
// that's fine // that's fine
return; return;
@ -90,8 +91,7 @@ fn take_control(interactive: bool) {
} }
} }
} }
if !success && interactive {
if interactive {
eprintln!("ERROR: failed take control of the terminal, we might be orphaned"); eprintln!("ERROR: failed take control of the terminal, we might be orphaned");
std::process::exit(1); std::process::exit(1);
} }