Remove Ctrl-C handler, fixes #84

src/bin/hexyl.rs

@@ -2,12 +2,9 @@
 extern crate clap;
 
 use atty;
-use ctrlc;
 
 use std::fs::File;
 use std::io::{self, prelude::*};
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
 
 use clap::{App, AppSettings, Arg};
 
@@ -113,21 +110,12 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
         .and_then(parse_hex_or_int)
         .unwrap_or(0);
 
-    // Set up Ctrl-C handler
-    let cancelled = Arc::new(AtomicBool::new(false));
-    let c = cancelled.clone();
-
-    ctrlc::set_handler(move || {
-        c.store(true, Ordering::SeqCst);
-    })
-    .expect("Error setting Ctrl-C handler");
-
     let stdout = io::stdout();
     let mut stdout_lock = stdout.lock();
 
     let mut printer = Printer::new(&mut stdout_lock, show_color, border_style, squeeze);
     printer.display_offset(display_offset as usize);
-    printer.print_all(&mut reader, Some(cancelled))?;
+    printer.print_all(&mut reader)?;
 
     Ok(())
 }

src/lib.rs

@@ -1,16 +1,12 @@
 pub mod squeezer;
 
 use std::io::{self, Read, Write};
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
 
 use ansi_term::Color;
 use ansi_term::Color::Fixed;
 
 use crate::squeezer::{SqueezeAction, Squeezer};
 
-type Cancelled = Arc<AtomicBool>;
-
 const BUFFER_SIZE: usize = 256;
 
 const COLOR_NULL: Color = Fixed(242); // grey
@@ -408,11 +404,10 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
     }
 
     /// Loop through the given `Reader`, printing until the `Reader` buffer
-    /// is exhausted, or the optional `cancelled` bool is set to true.
+    /// is exhausted.
     pub fn print_all<Reader: Read>(
         &mut self,
-        mut reader: Reader,
-        canceller: Option<Cancelled>,
+        mut reader: Reader
     ) -> Result<(), Box<dyn std::error::Error>> {
         let mut buffer = [0; BUFFER_SIZE];
         'mainloop: loop {
@@ -421,13 +416,6 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
                 break;
             }
 
-            if let Some(cancelled) = &canceller {
-                if cancelled.load(Ordering::SeqCst) {
-                    eprintln!("hexyl has been cancelled.");
-                    std::process::exit(130); // Set exit code to 128 + SIGINT
-                }
-            }
-
             for b in &buffer[..size] {
                 let res = self.print_byte(*b);