Escape sysroot and manifest paths to remove blank spaces

Author: AxelMontini

src/cargo.rs

@@ -45,7 +45,7 @@ impl Rustflags {
     pub fn for_xargo(&self, home: &Home) -> String {
         let mut flags = self.flags.clone();
         flags.push("--sysroot".to_owned());
-        flags.push(home.display().to_string());
+        flags.push(util::escape_argument_spaces(format!("{}", home.display())));
         flags.join(" ")
     }
 }

src/sysroot.rs

@@ -105,7 +105,7 @@ fn build_crate(
         }
     }
     cmd.arg("--manifest-path");
-    cmd.arg(td.join("Cargo.toml"));
+    cmd.arg(util::escape_argument_spaces(td.join("Cargo.toml").to_str().expect("This path doesn't contain valid UTF-8 characters")));
     cmd.args(&["--target", cmode.orig_triple()]);
 
     if verbose {

src/util.rs

@@ -100,3 +100,13 @@ pub fn write(path: &Path, contents: &str) -> Result<()> {
         .write_all(contents.as_bytes())
         .chain_err(|| format!("couldn't write to {}", p))
 }
+
+pub fn escape_argument_spaces<S: Into<String>>(arg: S) -> String {
+    #[cfg(target_os = "windows")]
+    let escaped = arg.into().replace(" ", "%20");
+
+    #[cfg(not(target_os = "windows"))]
+    let escaped = arg.into().replace(" ", "\\ ");
+
+    escaped
+}