squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

path: Fix joining Windows path when the receiver is "C:"

Browse source 
WindowsPath::new("C:").join("a") produces r"C:\a". This is incorrect.
It should produce "C:a".
This commit is contained in:
Kevin Ballard 2014-01-15 12:53:56 -08:00
parent 9008931125
commit c57920b37b
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libstd/path/windows.rs
View file

@ -261,9 +261,14 @@ impl GenericPathUnsafe for Path {
let mut s = str::with_capacity(me.repr.len() + 1 + pathlen);
s.push_str(me.repr);
let plen = me.prefix_len();
if !(me.repr.len() > plen && me.repr[me.repr.len()-1] == sep as u8) {
// if me is "C:" we don't want to add a path separator
match me.prefix {
Some(DiskPrefix) if me.repr.len() == plen => (),
_ if !(me.repr.len() > plen && me.repr[me.repr.len()-1] == sep as u8) => {
s.push_char(sep);
}
_ => ()
}
match path_ {
None => s.push_str(path),
Some(p) => s.push_str(p)
@ -1549,6 +1554,8 @@ mod tests {
t!(s: "C:a\\b\\c", "C:d", "C:a\\b\\c\\d");
t!(s: "C:a\\b", "..\\..\\..\\c", "C:..\\c");
t!(s: "C:\\a\\b", "..\\..\\..\\c", "C:\\c");
t!(s: "C:", r"a\b\c", r"C:a\b\c");
t!(s: "C:", r"..\a", r"C:..\a");
t!(s: "\\\\server\\share\\foo", "bar", "\\\\server\\share\\foo\\bar");
t!(s: "\\\\server\\share\\foo", "..\\..\\bar", "\\\\server\\share\\bar");
t!(s: "\\\\server\\share\\foo", "C:baz", "C:baz");