uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

wait for child to stop after sending signal

Browse Source
This commit is contained in:
Ulrich Hornung
2024-03-12 19:04:46 +01:00
parent abfd000367
commit 38b15c9736
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uu/timeout/src/timeout.rs
+8 -1
View File
@@ -343,8 +343,15 @@ fn timeout(
send_signal(process, signal, foreground);
match kill_after {
None => {
let status = process.wait()?;
if preserve_status {
Err(ExitStatus::SignalSent(signal).into())
if let Some(ec) = status.code() {
Err(ec.into())
} else if let Some(sc) = status.signal() {
Err(ExitStatus::SignalSent(sc.try_into().unwrap()).into())
} else {
Err(ExitStatus::CommandTimedOut.into())
}
} else {
Err(ExitStatus::CommandTimedOut.into())
}