Proper ctrl+c handling in Windows (fix #508)

src/ctrlc/interrupted.rs

@@ -0,0 +1,22 @@
+use lazy_static::lazy_static;
+use std::sync::atomic::{AtomicBool, Ordering};
+
+lazy_static! {
+    /// A global variable telling whether the application has been interrupted.
+    static ref INTERRUPTED: AtomicBool = AtomicBool::new(false);
+}
+
+/// Tells whether the program has been interrupted
+pub fn interrupted() -> bool {
+    INTERRUPTED.load(Ordering::SeqCst)
+}
+
+/// Clears the interrupted flag
+pub fn unset_interrupted() {
+    debug_assert!(INTERRUPTED.load(Ordering::SeqCst));
+    INTERRUPTED.store(false, Ordering::SeqCst)
+}
+
+pub fn set_interrupted() {
+    INTERRUPTED.store(true, Ordering::SeqCst)
+}

src/ctrlc/mod.rs

@@ -1,11 +1,13 @@
-//! Provides handling for process interruption.
-//! There's no actual handling for Windows at the moment.
+mod interrupted;
+
 #[cfg(unix)]
 mod unix;
 #[cfg(unix)]
-pub use self::unix::*;
+pub use self::unix::set_handler;
 
 #[cfg(windows)]
 mod windows;
 #[cfg(windows)]
-pub use self::windows::*;
+pub use self::windows::set_handler;
+
+pub use self::interrupted::*;

src/ctrlc/unix.rs

@@ -1,27 +1,10 @@
 //! SIGINT handling in Unix systems.
-use lazy_static::lazy_static;
+use crate::ctrlc::interrupted::set_interrupted;
 use nix::sys::signal;
-use std::sync::atomic::{AtomicBool, Ordering};
-
-lazy_static! {
-    /// A global variable telling whether the application has been interrupted.
-    static ref INTERRUPTED: AtomicBool = AtomicBool::new(false);
-}
-
-/// Tells whether the program has been interrupted
-pub fn interrupted() -> bool {
-    INTERRUPTED.load(Ordering::SeqCst)
-}
-
-/// Clears the interrupted flag
-pub fn unset_interrupted() {
-    debug_assert!(INTERRUPTED.load(Ordering::SeqCst));
-    INTERRUPTED.store(false, Ordering::SeqCst)
-}
 
 /// Handle SIGINT. Set the interruption flag.
 extern "C" fn handle_sigint(_: i32) {
-    INTERRUPTED.store(true, Ordering::SeqCst)
+    set_interrupted()
 }
 
 /// Set the necessary signal handlers.

src/ctrlc/windows.rs

@@ -1,9 +1,21 @@
 //! A stub for Ctrl + C handling.
+use crate::ctrlc::interrupted::set_interrupted;
+use winapi::shared::minwindef::{BOOL, DWORD, FALSE, TRUE};
+use winapi::um::consoleapi::SetConsoleCtrlHandler;
+use winapi::um::wincon::CTRL_C_EVENT;
 
-pub fn interrupted() -> bool {
-    false
+extern "system" fn handler(ctrl_type: DWORD) -> BOOL {
+    match ctrl_type {
+        CTRL_C_EVENT => {
+            set_interrupted();
+            TRUE
+        }
+        _ => FALSE,
+    }
 }
 
-pub fn unset_interrupted() {}
-
-pub fn set_handler() {}
+pub fn set_handler() {
+    if 0 == unsafe { SetConsoleCtrlHandler(Some(handler), TRUE) } {
+        log::error!("Cannot set a control C handler")
+    }
+}