Merge #1157

1157: Fix mount paths on Windows. r=Emilgardis a=Alexhuszagh

Fixes mount paths outside of the workspace mount directory on Windows and those provided as a WSL path. This also adds unittests for Windows outside of WSL2.

Closes #1145.
Closes #1156.

Co-authored-by: Alex Huszagh <[email protected]>

Author: bors[bot]

.changes/1057.json

@@ -0,0 +1,5 @@
+{
+    "description": "fix mount paths outside of the workspace mount directory on Windows and those provided as a WSL path.",
+    "type": "fixed",
+    "issues": [1145, 1156]
+}

ci/shared.sh

@@ -48,3 +48,20 @@ function mkcargotemp {
     ' > "$CARGO_TMP_DIR"/Cargo.toml
     echo "$td"
 }
+
+function binary_path() {
+    local binary="${1}"
+    local home="${2}"
+    local build_mode="${3}"
+    local cross="${home}/target/${build_mode}/${binary}"
+
+    case "$OSTYPE" in
+        msys*|cygwin*)
+            cross="${cross}.exe"
+            ;;
+        *)
+            ;;
+    esac
+
+    echo "${cross}"
+}

ci/test-bisect.sh

@@ -22,7 +22,8 @@ main() {
     retry cargo fetch
     cargo build
     cargo install cargo-bisect-rustc --debug
-    export CROSS="${PROJECT_HOME}/target/debug/cross"
+    CROSS=$(binary_path cross "${PROJECT_HOME}" debug)
+    export CROSS
 
     td="$(mktemp -d)"
     git clone --depth 1 https://github.com/cross-rs/rust-cpp-hello-word "${td}"

ci/test-foreign-toolchain.sh

@@ -15,7 +15,8 @@ main() {
 
     retry cargo fetch
     cargo build
-    export CROSS="${PROJECT_HOME}/target/debug/cross"
+    CROSS=$(binary_path cross "${PROJECT_HOME}" debug)
+    export CROSS
 
     td="$(mkcargotemp -d)"
 
@@ -31,7 +32,7 @@ image.name = "alpine:edge"
 image.toolchain = ["x86_64-unknown-linux-musl"]
 pre-build = ["apk add --no-cache gcc musl-dev"]' >"${CARGO_TMP_DIR}"/Cross.toml
 
-    "$CROSS" run -v
+    "${CROSS}" run -v
 
     local tmp_basename
     tmp_basename=$(basename "${CARGO_TMP_DIR}")
@@ -59,7 +60,7 @@ name = "ubuntu:20.04"
 toolchain = ["aarch64-unknown-linux-gnu"]
     ' >"${CARGO_TMP_DIR}"/Cross.toml
 
-    "$CROSS" build -v
+    "${CROSS}" build -v
 
     "${CROSS_ENGINE}" images --format '{{.Repository}}:{{.Tag}}' --filter 'label=org.cross-rs.for-cross-target' | grep "cross-custom-${tmp_basename}" | xargs "${CROSS_ENGINE}" rmi
 

ci/test-podman.sh

@@ -22,7 +22,8 @@ main() {
 
     retry cargo fetch
     cargo build
-    export CROSS="${PROJECT_HOME}/target/debug/cross"
+    CROSS=$(binary_path cross "${PROJECT_HOME}" debug)
+    export CROSS
 
     td="$(mkcargotemp -d)"
     parent=$(dirname "${td}")

ci/test-remote.sh

@@ -20,8 +20,10 @@ main() {
 
     retry cargo fetch
     cargo build
-    export CROSS="${PROJECT_HOME}/target/debug/cross"
-    export CROSS_UTIL="${PROJECT_HOME}/target/debug/cross-util"
+    CROSS=$(binary_path cross "${PROJECT_HOME}" debug)
+    export CROSS
+    CROSS_UTIL=$(binary_path cross-util "${PROJECT_HOME}" debug)
+    export CROSS_UTIL
 
     # if the create volume fails, ensure it exists.
     if ! err=$("${CROSS_UTIL}" volumes create 2>&1 >/dev/null); then

ci/test-zig-image.sh

@@ -34,7 +34,8 @@ main() {
 
     retry cargo fetch
     cargo build
-    export CROSS="${PROJECT_HOME}/target/debug/cross"
+    CROSS=$(binary_path cross "${PROJECT_HOME}" debug)
+    export CROSS
 
     td="$(mktemp -d)"
     git clone --depth 1 https://github.com/cross-rs/rust-cpp-hello-word "${td}"

ci/test.sh

@@ -31,7 +31,8 @@ main() {
     export QEMU_STRACE=1
 
     # ensure we have the proper toolchain and optional rust flags
-    export CROSS=("${PROJECT_HOME}/target/debug/cross")
+    CROSS=$(binary_path cross "${PROJECT_HOME}" debug)
+    export CROSS=("${CROSS}")
     export CROSS_FLAGS="-v"
     if (( ${BUILD_STD:-0} )); then
         # use build-std instead of xargo, due to xargo being

src/docker/local.rs

@@ -78,6 +78,7 @@ pub(crate) fn run(
         ])
         // Prevent `bin` from being mounted inside the Docker container.
         .args(["-v", &format!("{}/bin", toolchain_dirs.cargo_mount_path())]);
+
     docker.args([
         "-v",
         &format!(

src/file.rs

@@ -34,7 +34,7 @@ pub trait PathExt {
 #[cfg(target_family = "windows")]
 fn format_prefix(prefix: &str) -> Result<String> {
     match prefix {
-        "" => eyre::bail!("Error: got empty windows prefix"),
+        "" => Ok("".to_owned()),
         _ => Ok(format!("/mnt/{}", prefix.to_lowercase())),
     }
 }
@@ -196,13 +196,28 @@ fn _canonicalize(path: &Path) -> Result<PathBuf> {
     }
 }
 
+fn is_wsl_absolute(path: &str) -> bool {
+    if !cfg!(target_os = "windows") {
+        return false;
+    }
+    let path = path.strip_prefix("/mnt/").unwrap_or(path);
+    let maybe_drive = path.split_once('/').map_or(path, |x| x.0);
+
+    maybe_drive.len() == 1 && matches!(maybe_drive.chars().next(), Some('a'..='z'))
+}
+
 // Fix for issue #581. target_dir must be absolute.
 pub fn absolute_path(path: impl AsRef<Path>) -> Result<PathBuf> {
-    Ok(if path.as_ref().is_absolute() {
-        path.as_ref().to_path_buf()
-    } else {
-        env::current_dir()?.join(path)
-    })
+    let as_ref = path.as_ref();
+    Ok(
+        if as_ref.is_absolute()
+            || cfg!(target_family = "windows") && is_wsl_absolute(as_ref.to_utf8()?)
+        {
+            as_ref.to_path_buf()
+        } else {
+            env::current_dir()?.join(path)
+        },
+    )
 }
 
 /// Pretty format a file path. Also removes the path prefix from a command if wanted
@@ -319,9 +334,22 @@ mod tests {
         assert!(p!("C:").join("..").as_posix_relative().is_err());
     }
 
+    #[test]
+    #[cfg(target_family = "windows")]
+    fn is_absolute_wslpath() {
+        assert!(is_wsl_absolute("/mnt/c/Users"));
+        assert!(is_wsl_absolute("/mnt/c"));
+        assert!(is_wsl_absolute("/mnt/z/Users"));
+        assert!(!is_wsl_absolute("/mnt"));
+        assert!(!is_wsl_absolute("/mnt/cc"));
+        assert!(!is_wsl_absolute("/mnt/zc"));
+    }
+
     #[test]
     #[cfg(target_family = "windows")]
     fn as_posix_with_drive() {
+        use regex::Regex;
+
         result_eq(p!(r"C:\").as_posix_absolute(), Ok("/mnt/c".to_owned()));
         result_eq(
             p!(r"C:\Users").as_posix_absolute(),
@@ -336,6 +364,17 @@ mod tests {
             p!(r"\\.\C:\Users").as_posix_absolute(),
             Ok("/mnt/c/Users".to_owned()),
         );
+
+        result_eq(
+            p!(r"/mnt/c/Users").as_posix_absolute(),
+            Ok("/mnt/c/Users".to_owned()),
+        );
+        result_eq(p!(r"/mnt/c").as_posix_absolute(), Ok("/mnt/c".to_owned()));
+
+        let regex = Regex::new("/mnt/[A-Za-z]/mnt").unwrap();
+        let result = p!(r"/mnt").as_posix_absolute();
+        assert!(result.is_ok());
+        assert!(regex.is_match(&result.unwrap()));
     }
 
     #[test]