fix: Windows paths suck, really

mhx · Feb 13, 2024 · 8e32947 · 8e32947 · theintel · Feb 20, 2024
1 parent b136bba
commit 8e32947
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/dwarfs/util.cpp b/src/dwarfs/util.cpp
@@ -306,15 +306,17 @@ void shorten_path_string(std::string& path, char separator, size_t max_len) {
 
 std::filesystem::path canonical_path(std::filesystem::path p) {
   if (!p.empty()) {
-#ifdef _WIN32
-    p = std::filesystem::path(L"\\\\?\\" + p.wstring());
-#endif
-
     try {
       p = std::filesystem::canonical(p);
     } catch (std::filesystem::filesystem_error const&) {
       p = std::filesystem::absolute(p);
     }
+
+#ifdef _WIN32
+    if (auto wstr = p.wstring(); !wstr.starts_with(L"\\\\")) {
+      p = std::filesystem::path(L"\\\\?\\" + wstr);
+    }
+#endif
   }
 
   return p;