kitchen/oysh
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(runtime): kill existing processes on error

Browse source
This commit is contained in:
buffet 2022-09-23 22:04:16 +00:00
parent 924a7462bd
commit c1881bb7b2
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/oyster_runtime/src/pipeline.rs
View file

@ -12,7 +12,10 @@ use nix::{
errno::Errno, errno::Errno,
fcntl::OFlag, fcntl::OFlag,
libc, libc,
sys::wait::{self, WaitPidFlag, WaitStatus}, sys::{
signal,
wait::{self, WaitPidFlag, WaitStatus},
},
unistd::{self, Pid}, unistd::{self, Pid},
}; };
use oyster_parser::ast::{self, Redirect}; use oyster_parser::ast::{self, Redirect};
@ -125,6 +128,11 @@ impl Shell {
wait_pgid(pgid) wait_pgid(pgid)
})(); })();
if status.is_err() && pgid != Pid::from_raw(0) {
let _ = signal::killpg(pgid, signal::Signal::SIGTERM);
let _ = signal::killpg(pgid, signal::Signal::SIGCONT);
}
let _ = unistd::tcsetpgrp(libc::STDIN_FILENO, unistd::getpgid(None).unwrap()); let _ = unistd::tcsetpgrp(libc::STDIN_FILENO, unistd::getpgid(None).unwrap());
status status