Consider some relative path case in io::JoinPath.

lighttransport · Oct 29, 2023 · db99c1a · db99c1a
1 parent 5687d89
commit db99c1a
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/src/io-util.cc b/src/io-util.cc
@@ -62,6 +62,7 @@
 #endif
 
 #include "io-util.hh"
+#include "str-util.hh"
 
 namespace tinyusdz {
 namespace io {
@@ -502,10 +503,24 @@ std::string JoinPath(const std::string &dir, const std::string &filename) {
   } else {
     // check '/'
     char lastChar = *dir.rbegin();
+
+    // TODO: Support more relative path case.
+
+    std::string basedir;
     if (lastChar != '/') {
-      return dir + std::string("/") + filename;
+      basedir = dir + std::string("/");
+    } else {
+      basedir = dir;
+    }
+
+    if (basedir.size()) {
+      if (startsWith(filename, "./")) {
+        // strip "./"
+        return basedir + removePrefix(filename, "./");
+      }
+      return basedir + filename;
     } else {
-      return dir + filename;
+      return filename;
     }
   }
 }
@@ -611,6 +626,13 @@ std::string FindFile(const std::string &filename,
     return filename;
   }
 
+  if (search_paths.empty()) {
+    std::string absPath = io::ExpandFilePath(filename, /* userdata */ nullptr);
+    if (io::FileExists(absPath, /* userdata */ nullptr)) {
+      return absPath;
+    }
+  }
+
   for (size_t i = 0; i < search_paths.size(); i++) {
     std::string absPath = io::ExpandFilePath(
         io::JoinPath(search_paths[i], filename), /* userdata */ nullptr);