Fix exec Escaping Issues (sharkdp#155)

Closes sharkdp#155

Cargo.toml

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

src/exec/escape.rs

@@ -0,0 +1,32 @@
+use std::borrow::Cow;
+
+#[cfg(windows)]
+const ESCAPE_CHAR: u8 = b'^';
+
+#[cfg(not(windows))]
+const ESCAPE_CHAR: u8 = b'\\';
+
+fn needs_escape(byte: u8) -> bool {
+    byte < 43 || (byte > 58 && byte < 65) || (byte > 90 && byte < 97) || (byte > 122 && byte <= 127)
+}
+
+pub fn escape<'a>(input: &'a str) -> Cow<'a, str> {
+    let chars_to_escape = input
+        .as_bytes()
+        .iter()
+        .filter(|&&x| needs_escape(x))
+        .count();
+    if chars_to_escape == 0 {
+        Cow::Borrowed(input)
+    } else {
+        let mut output = Vec::with_capacity(input.len() + chars_to_escape);
+        for &character in input.as_bytes() {
+            if needs_escape(character) {
+                output.push(ESCAPE_CHAR);
+            }
+            output.push(character);
+        }
+        let output = unsafe { String::from_utf8_unchecked(output) };
+        Cow::Owned(output)
+    }
+}

src/exec/input.rs

@@ -9,7 +9,7 @@
 use std::path::MAIN_SEPARATOR;
 use std::borrow::Cow;
 
-use shell_escape::escape;
+use super::escape;
 
 /// A builder for efficiently generating input strings.
 ///
@@ -90,7 +90,7 @@ impl<'a> Input<'a> {
     }
 
     pub fn get(&'a self) -> Cow<'a, str> {
-        escape(Cow::Borrowed(self.data))
+        escape(self.data)
     }
 
     #[cfg(test)]

src/exec/mod.rs

@@ -7,6 +7,7 @@
 // according to those terms.
 
 // TODO: Possible optimization could avoid pushing characters on a buffer.
+mod escape;
 mod ticket;
 mod token;
 mod job;
@@ -20,6 +21,7 @@ use self::input::Input;
 use self::ticket::CommandTicket;
 use self::token::Token;
 pub use self::job::job;
+pub use self::escape::escape;
 
 /// Signifies that a placeholder token was found
 const PLACE: u8 = 1;

src/main.rs

@@ -18,7 +18,6 @@ extern crate libc;
 extern crate num_cpus;
 extern crate regex;
 extern crate regex_syntax;
-extern crate shell_escape;
 #[cfg(windows)]
 extern crate windows;