Merge branch 'fix-ctrl-c' into 'master'

Fix ctrl-c with interactive session

See merge request redox-os/ion!932

src/lib/shell/binary/mod.rs

@@ -91,13 +91,9 @@ impl Binary for Shell {
         self.evaluate_init_file();
 
         loop {
-            let mut lines = itertools::repeat_call(|| {
-                let line = self.readln();
-                self.flags |= UNTERMINATED;
-                line
-            })
-            .filter_map(|cmd| cmd)
-            .flat_map(|s| s.into_bytes().into_iter().chain(Some(b'\n')));
+            let mut lines = itertools::repeat_call(|| self.readln())
+                .filter_map(|cmd| cmd)
+                .flat_map(|s| s.into_bytes().into_iter().chain(Some(b'\n')));
             match Terminator::new(&mut lines).terminate().ok() {
                 Some(command) => {
                     self.flags &= !UNTERMINATED;

src/lib/shell/binary/readln.rs

-use super::super::{completer::*, Binary, DirectoryStack, Shell, Variables};
+use super::super::{completer::*, flags, Binary, DirectoryStack, Shell, Variables};
 use crate::{sys, types};
 use liner::{BasicCompleter, CursorPosition, Event, EventKind};
 use std::{env, io::ErrorKind, mem, path::PathBuf};
@@ -110,7 +110,10 @@ pub(crate) fn readln(shell: &mut Shell) -> Option<String> {
     );
 
     match line {
-        Ok(line) => Some(line),
+        Ok(line) => {
+            shell.flags |= flags::UNTERMINATED;
+            Some(line)
+        }
         // Handles Ctrl + C
         Err(ref err) if err.kind() == ErrorKind::Interrupted => None,
         // Handles Ctrl + D