Raise SIGINT when dying by ^C

Fixes sharkdp#854.
tmccombs · Nov 15, 2021 · fe99270 · fe99270
1 parent 2b1bf47
commit fe99270
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,6 +57,7 @@ features = ["suggestions", "color", "wrap_help"]
 
 [target.'cfg(unix)'.dependencies]
 users = "0.11.0"
+nix = "0.23.0"
 
 [target.'cfg(all(unix, not(target_os = "redox")))'.dependencies]
 libc = "0.2"

diff --git a/src/exit_codes.rs b/src/exit_codes.rs
@@ -1,5 +1,8 @@
 use std::process;
 
+#[cfg(unix)]
+use nix::sys::signal::{raise, signal, SigHandler, Signal};
+
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum ExitCode {
     Success,
@@ -26,6 +29,16 @@ impl ExitCode {
 
     /// Exit the process with the appropriate code.
     pub fn exit(self) -> ! {
+        #[cfg(unix)]
+        if self == ExitCode::KilledBySigint {
+            // Get rid of the SIGINT handler, if present, and raise SIGINT
+            unsafe {
+                if signal(Signal::SIGINT, SigHandler::SigDfl).is_ok() {
+                    let _ = raise(Signal::SIGINT);
+                }
+            }
+        }
+
         process::exit(self.into())
     }
 }