Handle terminal signals

Cargo.toml

@@ -39,6 +39,7 @@ lazy_static = "0.2.9"
 num_cpus = "1.6.2"
 regex = "0.2"
 regex-syntax = "0.4"
+ctrlc = "3.0"
 
 [target.'cfg(all(unix, not(target_os = "redox")))'.dependencies]
 libc = "0.2"

src/output.rs

@@ -13,16 +13,18 @@ use std::{fs, process};
 use std::io::{self, Write};
 use std::ops::Deref;
 use std::path::{self, Path, PathBuf, Component};
+use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 #[cfg(any(unix, target_os = "redox"))]
 use std::os::unix::fs::PermissionsExt;
 
 use ansi_term;
 
-pub fn print_entry(entry: &PathBuf, config: &FdOptions) {
+pub fn print_entry(entry: &PathBuf, config: &FdOptions, wants_to_quit: &Arc<AtomicBool>) {
     let path = entry.strip_prefix(".").unwrap_or(entry);
 
     let r = if let Some(ref ls_colors) = config.ls_colors {
-        print_entry_colorized(path, config, ls_colors)
+        print_entry_colorized(path, config, ls_colors, &wants_to_quit)
     } else {
         print_entry_uncolorized(path, config)
     };
@@ -33,7 +35,12 @@ pub fn print_entry(entry: &PathBuf, config: &FdOptions) {
     }
 }
 
-fn print_entry_colorized(path: &Path, config: &FdOptions, ls_colors: &LsColors) -> io::Result<()> {
+fn print_entry_colorized(
+    path: &Path,
+    config: &FdOptions,
+    ls_colors: &LsColors,
+    wants_to_quit: &Arc<AtomicBool>,
+) -> io::Result<()> {
     let default_style = ansi_term::Style::default();
 
     let stdout = io::stdout();
@@ -63,6 +70,11 @@ fn print_entry_colorized(path: &Path, config: &FdOptions, ls_colors: &LsColors)
             // Everything else uses a separator that is painted the same way as the component.
             _ => style.paint(path::MAIN_SEPARATOR.to_string()).to_string(),
         };
+
+        if wants_to_quit.load(Ordering::Relaxed) {
+            write!(handle, "\n")?;
+            process::exit(0);
+        }
     }
 
     if config.null_separator {

src/walk.rs

@@ -6,13 +6,16 @@
 // notice may not be copied, modified, or distributed except
 // according to those terms.
 
+extern crate ctrlc;
+
 use exec::{self, TokenizedCommand};
 use fshelper;
 use internal::{error, FdOptions};
 use output;
 
 use std::path::Path;
 use std::sync::{Arc, Mutex};
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc::channel;
 use std::thread;
 use std::time;
@@ -60,6 +63,16 @@ pub fn scan(root: &Path, pattern: Arc<Regex>, config: Arc<FdOptions>) {
         .threads(threads)
         .build_parallel();
 
+    let wants_to_quit = Arc::new(AtomicBool::new(false));
+
+    match config.ls_colors {
+        Some(_) => {
+            let wq = Arc::clone(&wants_to_quit);
+            ctrlc::set_handler(move || { wq.store(true, Ordering::Relaxed); }).unwrap();
+        }
+        None => (),
+    }
+
     // Spawn the thread that receives all results through the channel.
     let rx_config = Arc::clone(&config);
     let receiver_thread = thread::spawn(move || {
@@ -113,7 +126,8 @@ pub fn scan(root: &Path, pattern: Arc<Regex>, config: Arc<FdOptions>) {
                         if time::Instant::now() - start > max_buffer_time {
                             // Flush the buffer
                             for v in &buffer {
-                                output::print_entry(v, &rx_config);
+                                output::print_entry(&v, &rx_config, &wants_to_quit);
+                                output::print_entry(v, &rx_config, &wants_to_quit);
                             }
                             buffer.clear();
 
@@ -122,7 +136,7 @@ pub fn scan(root: &Path, pattern: Arc<Regex>, config: Arc<FdOptions>) {
                         }
                     }
                     ReceiverMode::Streaming => {
-                        output::print_entry(&value, &rx_config);
+                        output::print_entry(&value, &rx_config, &wants_to_quit);
                     }
                 }
             }
@@ -132,7 +146,7 @@ pub fn scan(root: &Path, pattern: Arc<Regex>, config: Arc<FdOptions>) {
             if !buffer.is_empty() {
                 buffer.sort();
                 for value in buffer {
-                    output::print_entry(&value, &rx_config);
+                    output::print_entry(&value, &rx_config, &wants_to_quit);
                 }
             }
         }