fixup! Handle SIGPIPE

Author: MarkusPettersson98

Cargo.lock

@@ -22,14 +22,14 @@ thiserror = { workspace = true }
 futures = { workspace = true }
 itertools = "0.10"
 natord = "1.0.9"
+nix = { version = "0.29.0", features = ["signal"] }
 
 mullvad-types = { path = "../mullvad-types", features = ["clap"] }
 mullvad-version = { path = "../mullvad-version" }
 talpid-types = { path = "../talpid-types" }
 
 mullvad-management-interface = { path = "../mullvad-management-interface" }
 tokio = { workspace = true, features =  ["macros", "rt-multi-thread", "fs"] }
-sigpipe = "0.1"
 serde = { workspace = true }
 serde_json = { workspace = true }
 

mullvad-cli/Cargo.toml

@@ -154,9 +154,9 @@ enum Cli {
 async fn main() -> Result<()> {
     // Handle SIGPIPE
     // https://stackoverflow.com/questions/65755853/simple-word-count-rust-program-outputs-valid-stdout-but-panicks-when-piped-to-he/65760807
-    // https://github.com/rust-lang/rust/issues/119980
     // https://github.com/typst/typst/pull/5444
-    sigpipe::reset();
+    #[cfg(unix)]
+    handle_sigpipe().unwrap();
 
     match Cli::parse() {
         Cli::Account(cmd) => cmd.handle().await,
@@ -195,3 +195,19 @@ async fn main() -> Result<()> {
         }
     }
 }
+
+/// Setup a signal handler for `SIGPIPE`.
+/// Rust is notoriously bad in this regard: https://github.com/rust-lang/rust/issues/119980
+///
+/// # Note
+/// Make sure to only call this function to replace the default signal handler. If any other signal
+/// handler for `SIGPIPE` has been installed, refrain from calling this function.
+#[cfg(unix)]
+fn handle_sigpipe() -> Result<(), nix::errno::Errno> {
+    use nix::sys::signal::{signal, SigHandler, Signal};
+    // SAFETY: The caller promises to only replace the default signal handler for SIGPIPE.
+    // SAFETY: We do not use the previous signal handler, which could cause UB if carelessly:
+    // https://pubs.opengroup.org/onlinepubs/9699919799/functions/signal.html
+    unsafe { signal(Signal::SIGPIPE, SigHandler::SigDfl) }?;
+    Ok(())
+}