extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-02-18 03:21:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic when encountering ENOTTY. (#7001)

Browse Source
This commit is contained in:
Ian Manske 2022-11-04 20:06:04 +00:00 committed by GitHub
parent 36ae384fb3
commit f1bde69131
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.rs
View File

@ -45,17 +45,18 @@ fn take_control(interactive: bool) {
}; };
let shell_pgid = unistd::getpgrp(); let shell_pgid = unistd::getpgrp();
let owner_pgid = unistd::tcgetpgrp(nix::libc::STDIN_FILENO).expect("tcgetpgrp");
// Common case, nothing to do match unistd::tcgetpgrp(nix::libc::STDIN_FILENO) {
if owner_pgid == shell_pgid { Ok(owner_pgid) if owner_pgid == shell_pgid => {
return; // Common case, nothing to do
} return;
}
// This can apparently happen with sudo: https://github.com/fish-shell/fish-shell/issues/7388 Ok(owner_pgid) if owner_pgid == unistd::getpid() => {
if owner_pgid == unistd::getpid() { // This can apparently happen with sudo: https://github.com/fish-shell/fish-shell/issues/7388
let _ = unistd::setpgid(owner_pgid, owner_pgid); let _ = unistd::setpgid(owner_pgid, owner_pgid);
return; return;
}
_ => (),
} }
// Reset all signal handlers to default // Reset all signal handlers to default