mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comment clarification and typo fix

Browse Source
This commit is contained in:
Ralf Jung 2024-04-18 22:17:10 +02:00
parent 1ce64e717f
commit 5067dd21b6
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/miri/src/shims/os_str.rs
View File

@ -260,6 +260,8 @@ fn convert_path<'a>(
let this = self.eval_context_ref();
let target_os = &this.tcx.sess.target.os;
// Below we assume that everything non-Windows works like Unix, at least
// when it comes to file system path conventions.
#[cfg(windows)]
return if target_os == "windows" {
// Windows-on-Windows, all fine.
@ -297,6 +299,12 @@ fn convert_path<'a>(
{
converted.remove(0);
}
// If the path starts with `\\`, it is a magic Windows path. Conveniently, paths
// starting with `//` on Unix are also magic where the first component can have
// "application-specific" meaning, which is reflected e.g. by `path::absolute`
// leaving leading `//` alone (but normalizing leading `///` to `/`). So we
// don't have to do anything, the magic Windows path should work mostly fine as
// a magic Unix path.
}
}
Cow::Owned(OsString::from_wide(&converted))
@ -324,13 +332,15 @@ fn convert_path<'a>(
{
converted.remove(0);
}
// If this start withs a `\` but not a `\\`, then for Windows this is a relative
// path. But the host path is absolute as it started with `/`. We add `\\?` so
// it starts with `\\?\` which is some magic path on Windows that *is*
// considered absolute.
// If this starts withs a `\` but not a `\\`, then for Windows this is a
// relative path (relative to "the root of the current directory", e.g. the
// drive letter). But the host path on Unix is absolute as it starts with `/`.
else if converted.get(0).copied() == Some(b'\\')
&& converted.get(1).copied() != Some(b'\\')
{
// We add `\\?` so it starts with `\\?\` which is some magic path on Windows
// that *is* considered absolute. This way we store the absolute host path
// in something that looks like an absolute path to the (Windows) target.
converted.splice(0..0, b"\\\\?".iter().copied());
}
}