Only sanitize archive part of the path (#12)

sk-zk · Sep 16, 2024 · c28e118 · c28e118
1 parent 6af2bd3
commit c28e118
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Extractor/Program.cs b/Extractor/Program.cs
@@ -221,11 +221,11 @@ private static void ExtractScs(string scsPath, string[] startPaths,
                     case EntryType.File:
                         // TODO make sure this is actually a file
                         // and not a directory falsely labeled as one
-                        var outputPath = Path.Combine(destination, 
-                            startPath.StartsWith('/') ? startPath[1..] : startPath);
+                        var startPathWithoutSlash = startPath.StartsWith('/') ? startPath[1..] : startPath;
+                        var outputPath = Path.Combine(destination, SanitizePath(startPathWithoutSlash));
                         Console.Out.WriteLine($"Extracting {ReplaceControlChars(startPath)} ...");
-                        outputPath = SanitizePath(outputPath);
-                        ExtractToFile(startPath, outputPath, () => reader.ExtractToFile(startPath, outputPath));
+                        ExtractToFile(startPathWithoutSlash, outputPath, 
+                            () => reader.ExtractToFile(startPathWithoutSlash, outputPath));
                         break;
                     case EntryType.NotFound:
                         if (startPath == "/")
@@ -278,7 +278,7 @@ private static void ExtractRaw(string scsPath)
                 // subdirectory listings are useless because the file names are relative
                 if (entry.IsDirectory) continue;
 
-                var outputPath = SanitizePath(Path.Combine(outputDir, key.ToString("x")));
+                var outputPath = Path.Combine(outputDir, key.ToString("x"));
                 ExtractToFile(key.ToString("x"), outputPath, () => reader.ExtractToFile(entry, "", outputPath));
             }
 
@@ -340,7 +340,7 @@ private static void ExtractFiles(IHashFsReader reader, List<string> files)
                 // The directory listing of core.scs only lists itself, but as a file, breaking everything
                 if (file == "/") continue;
 
-                var outputPath = SanitizePath(Path.Combine(destination, file[1..]));
+                var outputPath = Path.Combine(destination, SanitizePath(file[1..]));
                 ExtractToFile(file, outputPath, () => reader.ExtractToFile(file, outputPath));
             }
         }