Fix Windows CI: avoid UNC parsing

alexcrichton · Sep 12, 2022 · 80bc06f · 80bc06f
1 parent f4f439c
commit 80bc06f
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/src/entry.rs b/src/entry.rs
@@ -379,12 +379,26 @@ impl<'a> EntryFields<'a> {
 
         let mut file_dst = dst.to_path_buf();
         {
-            let path = self.path().map_err(|e| {
-                TarError::new(
-                    format!("invalid path in entry header: {}", self.path_lossy()),
-                    e,
-                )
-            })?;
+            let path = if !cfg!(windows) {
+                self.path()
+                    .map_err(|e| {
+                        TarError::new(
+                            format!("invalid path in entry header: {}", self.path_lossy()),
+                            e,
+                        )
+                    })?
+                    .into_owned()
+            } else {
+                // https://github.com/rust-lang/rust/issues/100833
+                let mut path = self.path_lossy();
+                while path.starts_with("//") {
+                    path = path
+                        .strip_prefix("//")
+                        .ok_or(other("failed to strip prefix //"))?
+                        .to_string();
+                }
+                Path::new(&path).to_path_buf()
+            };
             for part in path.components() {
                 match part {
                     // Leading '/' characters, root paths, and '.'