Add ctrlc for proper CTRL-C signal handling

Cargo.toml

@@ -25,6 +25,7 @@ regex = "0.2.5"
 
 [target.'cfg(not(target_os = "emscripten"))'.dependencies]
 clap = "2.29"
+ctrlc = "3.1"
 
 [target.'cfg(target_os = "emscripten")'.dependencies]
 emscripten-sys = "0.3"

src/bootlog.rs

@@ -32,7 +32,7 @@ pub fn run(appconfig: &AppConfig) {
         println!();
         csleep(sleep_length);
 
-        if appconfig.is_time_to_quit() {
+        if appconfig.should_exit() {
             return;
         }
     }

src/cargo.rs

@@ -48,7 +48,7 @@ pub fn run(appconfig: &AppConfig) {
 
             csleep(sleep_length);
 
-            if appconfig.is_time_to_quit() {
+            if appconfig.should_exit() {
                 return;
             }
         }

src/cc.rs

@@ -135,7 +135,7 @@ pub fn run(appconfig: &AppConfig) {
         let sleep_length = rng.gen_range(30, 200);
         csleep(sleep_length);
 
-        if appconfig.is_time_to_quit() {
+        if appconfig.should_exit() {
             return;
         }
     }

src/composer.rs

@@ -55,7 +55,7 @@ pub fn run(appconfig: &AppConfig) {
 
             csleep(sleep_length);
 
-            if appconfig.is_time_to_quit() {
+            if appconfig.should_exit() {
                 return;
             }
         }

src/cryptomining.rs

@@ -99,7 +99,7 @@ pub fn run(appconfig: &AppConfig) {
         }
         csleep(sleep_length);
 
-        if appconfig.is_time_to_quit() {
+        if appconfig.should_exit() {
             return
         }
     }

src/download.rs

@@ -63,7 +63,7 @@ pub fn run(appconfig: &AppConfig) {
             pb.add(bytes_per_sleep);
             csleep(sleep_millis);
 
-            if appconfig.is_time_to_quit() {
+            if appconfig.should_exit() {
                 return;
             }
         }

src/kernel_compile.rs

@@ -160,7 +160,7 @@ pub fn run(appconfig: &AppConfig) {
         println!("{}", line);
         csleep(sleep_length);
 
-        if appconfig.is_time_to_quit() {
+        if appconfig.should_exit() {
             return;
         }
     }

src/main.rs

@@ -6,6 +6,9 @@
 #[macro_use]
 extern crate clap;
 
+#[cfg(not(target_os = "emscripten"))]
+extern crate ctrlc;
+
 #[cfg(target_os = "emscripten")]
 extern crate emscripten_sys;
 
@@ -50,6 +53,14 @@ lazy_static! {
     static ref COMPOSERS_LIST: Vec<&'static str> = COMPOSERS.lines().collect();
 }
 
+#[cfg(not(target_os = "emscripten"))]
+use std::sync::atomic::AtomicBool;
+
+#[cfg(not(target_os = "emscripten"))]
+lazy_static! {
+    static ref CTRLC_PRESSED: AtomicBool = AtomicBool::new(false);
+}
+
 fn main() {
     Paint::enable_windows_ascii();
 
@@ -85,6 +96,11 @@ fn main() {
             }
             process::exit(0);
         }
+
+        use std::sync::atomic::Ordering;
+        ctrlc::set_handler(move || {
+            CTRLC_PRESSED.store(true, Ordering::SeqCst);
+        }).expect("Error setting Ctrl-C handler");
     }
 
     let mut rng = thread_rng();
@@ -104,7 +120,8 @@ fn main() {
         #[cfg(not(target_os = "emscripten"))]
         {
             use std::process;
-            if appconfig.is_time_to_quit() {
+            if appconfig.should_exit() {
+                println!("Saving work to disk...");
                 process::exit(0);
             }
         }

src/memdump.rs

@@ -46,7 +46,7 @@ pub fn run(appconfig: &AppConfig) {
         let row_delay = rng.gen_range(100, 200);
         csleep(row_delay);
 
-        if appconfig.is_time_to_quit() {
+        if appconfig.should_exit() {
             return;
         }
         println!();

src/parse_args.rs

@@ -23,16 +23,24 @@ pub struct AppConfig {
 
 impl AppConfig {
     /// Check whether it's time to stop running.
-    pub fn is_time_to_quit(&self) -> bool {
+    pub fn should_exit(&self) -> bool {
+        // Check whether CTRL-C was pressed.
+        #[cfg(not(target_os = "emscripten"))]
+        {
+            use std::sync::atomic::Ordering;
+            use CTRLC_PRESSED;
+            if CTRLC_PRESSED.load(Ordering::SeqCst) {
+                return true;
+            }
+        }
+
+        // Check if maximum running time is exceeded.
         if let Some(ea) = self.exit_after {
             if self.started_at.elapsed() > *ea {
-                true
-            } else {
-                false
+                return true;
             }
-        } else {
-            false
         }
+        return false;
     }
 }