fix(vpkpp): add directory methods were STILL a bit busted

craftablescience · Aug 22, 2024 · c866128 · c866128
1 parent 1b986ba
commit c866128
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/vpkpp/PackFile.cpp b/src/vpkpp/PackFile.cpp
@@ -258,16 +258,19 @@ void PackFile::addDirectory(const std::string& entryBaseDir_, const std::string&
 		if (!file.is_regular_file()) {
 			continue;
 		}
+		std::string absPath;
 		std::string entryPath;
 		try {
-			entryPath = this->cleanEntryPath(entryBaseDir + std::filesystem::absolute(file.path()).string().substr(dirLen));
+			absPath = std::filesystem::absolute(file.path()).string();
+			string::normalizeSlashes(absPath);
+			entryPath = this->cleanEntryPath(entryBaseDir + absPath.substr(dirLen));
 		} catch (const std::exception&) {
 			continue; // Likely a Unicode error, unsupported filename
 		}
 		if (entryPath.empty()) {
 			continue;
 		}
-		this->addEntry(entryPath, file.path().string(), creation ? creation(entryPath) : EntryOptions{});
+		this->addEntry(entryPath, absPath, creation ? creation(entryPath) : EntryOptions{});
 	}
 }