Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions src/uucore/src/lib/mods/panic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@ use std::panic::{self, PanicHookInfo};

/// Decide whether a panic was caused by a broken pipe (SIGPIPE) error.
fn is_broken_pipe(info: &PanicHookInfo) -> bool {
if let Some(res) = info.payload().downcast_ref::<String>() {
if res.contains("BrokenPipe") || res.contains("Broken pipe") {
return true;
}
}
false
info.payload()
.downcast_ref::<String>()
.is_some_and(|res| res.contains("BrokenPipe") || res.contains("Broken pipe"))
}

/// Terminate without error on panics that occur due to broken pipe errors.
Expand Down Expand Up @@ -55,14 +52,12 @@ pub fn preserve_inherited_sigpipe() {
use nix::libc;

// Check if parent specified that SIGPIPE should be default
if let Ok(val) = std::env::var("RUST_SIGPIPE") {
if val == "default" {
unsafe {
libc::signal(libc::SIGPIPE, libc::SIG_DFL);
// Remove the environment variable so child processes don't inherit it incorrectly
std::env::remove_var("RUST_SIGPIPE");
}
}
if let Ok(val) = std::env::var("RUST_SIGPIPE")
Comment thread
oech3 marked this conversation as resolved.
&& val == "default"
{
unsafe { libc::signal(libc::SIGPIPE, libc::SIG_DFL) };
// Remove the environment variable so child processes don't inherit it incorrectly
unsafe { std::env::remove_var("RUST_SIGPIPE") };
}
}

Expand Down
Loading