itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(util): Respect all ..s in normalize_path

Browse Source
This commit is contained in:
Ed Page 2024-10-30 14:41:47 -05:00
parent c53bdc4745
commit 7a6eaf9667
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/cargo-util/src/paths.rs
View File

@ -98,7 +98,14 @@ pub fn normalize_path(path: &Path) -> PathBuf {
}
Component::CurDir => {}
Component::ParentDir => {
ret.pop();
if ret.ends_with(Component::ParentDir) {
ret.push(Component::ParentDir);
} else {
let popped = ret.pop();
if !popped && !ret.has_root() {
ret.push(Component::ParentDir);
}
}
}
Component::Normal(c) => {
ret.push(c);
@ -879,13 +886,13 @@ mod tests {
("foo/bar/./././///", "foo/bar"),
("foo/bar/..", "foo"),
("foo/bar/../..", ""),
("foo/bar/../../..", ""),
("../../foo/bar", "foo/bar"),
("../../foo/bar/", "foo/bar"),
("../../foo/bar/./././///", "foo/bar"),
("../../foo/bar/..", "foo"),
("../../foo/bar/../..", ""),
("../../foo/bar/../../..", ""),
("foo/bar/../../..", ".."),
("../../foo/bar", "../../foo/bar"),
("../../foo/bar/", "../../foo/bar"),
("../../foo/bar/./././///", "../../foo/bar"),
("../../foo/bar/..", "../../foo"),
("../../foo/bar/../..", "../.."),
("../../foo/bar/../../..", "../../.."),
];
for (input, expected) in cases {
let actual = normalize_path(std::path::Path::new(input));