Merge pull request Laupetin#236 from Laupetin/fix/current-dir-prefix

fix: referencing files in cwd without dot slash
JezuzLizard · Aug 21, 2024 · 805e1a2 · 805e1a2
2 parents 31d93d3 + 42a3e20
commit 805e1a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Linker/Linker.cpp b/src/Linker/Linker.cpp
@@ -543,7 +543,10 @@ class LinkerImpl final : public Linker
                 return false;
             }
 
-            auto absoluteZoneDirectory = absolute(std::filesystem::path(zonePath).remove_filename()).string();
+            auto zoneDirectory = fs::path(zonePath).remove_filename();
+            if (zoneDirectory.empty())
+                zoneDirectory = fs::current_path();
+            auto absoluteZoneDirectory = absolute(zoneDirectory).string();
 
             auto zone = std::unique_ptr<Zone>(ZoneLoading::LoadZone(zonePath));
             if (zone == nullptr)

diff --git a/src/Unlinker/Unlinker.cpp b/src/Unlinker/Unlinker.cpp
@@ -381,7 +381,10 @@ class Unlinker::Impl
                 continue;
             }
 
-            auto absoluteZoneDirectory = absolute(std::filesystem::path(zonePath).remove_filename()).string();
+            auto zoneDirectory = fs::path(zonePath).remove_filename();
+            if (zoneDirectory.empty())
+                zoneDirectory = fs::current_path();
+            auto absoluteZoneDirectory = absolute(zoneDirectory).string();
 
             auto searchPathsForZone = GetSearchPathsForZone(absoluteZoneDirectory);
             searchPathsForZone.IncludeSearchPath(&m_search_paths);