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

rust-lang · Oct 30, 2024 · 4c5537e · 4c5537e
1 parent bade608
commit 4c5537e
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/crates/cargo-util/src/paths.rs b/crates/cargo-util/src/paths.rs
@@ -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));