diff options
Diffstat (limited to 'ext/fs/std_fs.rs')
| -rw-r--r-- | ext/fs/std_fs.rs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ext/fs/std_fs.rs b/ext/fs/std_fs.rs index 6bc15a72d..9e2acedcc 100644 --- a/ext/fs/std_fs.rs +++ b/ext/fs/std_fs.rs @@ -890,7 +890,15 @@ fn open_with_access_check( access_check: Option<AccessCheckCb>, ) -> FsResult<std::fs::File> { if let Some(access_check) = access_check { - let path = if path.is_absolute() { + let path_bytes = path.as_os_str().as_encoded_bytes(); + let is_windows_device_path = cfg!(windows) + && path_bytes.starts_with(br"\\.\") + && !path_bytes.contains(&b':'); + let path = if is_windows_device_path { + // On Windows, normalize_path doesn't work with device-prefix-style + // paths. We pass these through. + path.to_owned() + } else if path.is_absolute() { normalize_path(path) } else { let cwd = current_dir()?; @@ -898,8 +906,8 @@ fn open_with_access_check( }; (*access_check)(false, &path, &options)?; // On Linux, /proc may contain magic links that we don't want to resolve - let needs_canonicalization = - !cfg!(target_os = "linux") || path.starts_with("/proc"); + let needs_canonicalization = !is_windows_device_path + && (!cfg!(target_os = "linux") || path.starts_with("/proc")); let path = if needs_canonicalization { match path.canonicalize() { Ok(path) => path, @@ -916,7 +924,6 @@ fn open_with_access_check( } else { path }; - (*access_check)(true, &path, &options)?; // For windows |