Avoid fs::canonical on emscripten (incl. indirect through fs::relativ…

…e!) (openscad#5531)
UBaer21 · Dec 26, 2024 · 28c5405 · 28c5405
1 parent 481186b
commit 28c5405
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/io/fileutils.cc b/src/io/fileutils.cc
@@ -37,7 +37,11 @@ std::string lookup_file(const std::string& filename,
 fs::path fs_uncomplete(fs::path const& p, fs::path const& base)
 {
   if (p == fs::path{}) return p;
+#ifndef __EMSCRIPTEN__
   return fs::relative(p, base == fs::path{} ? fs::path{"."} : base);
+#else
+  return p;
+#endif
 }
 
 int64_t fs_timestamp(fs::path const& path) {

diff --git a/src/openscad.cc b/src/openscad.cc
@@ -708,10 +708,10 @@ int main(int argc, char **argv)
   PlatformUtils::ensureStdIO();
 #endif
 
-#ifdef __EMSCRIPTEN__
-  const auto applicationPath = boost::dll::fs::current_path();
-#else
+#ifndef __EMSCRIPTEN__
   const auto applicationPath = weakly_canonical(boost::dll::program_location()).parent_path().generic_string();
+#else
+  const auto applicationPath = boost::dll::fs::current_path();
 #endif
   PlatformUtils::registerApplicationPath(applicationPath);
 

diff --git a/src/platform/PlatformUtils.cc b/src/platform/PlatformUtils.cc
@@ -126,7 +126,9 @@ std::string PlatformUtils::userLibraryPath()
     if (pathstr == "") return "";
     path = fs::path(pathstr);
     if (!fs::exists(path)) return "";
+#ifndef __EMSCRIPTEN__
     path = fs::canonical(path);
+#endif
     // LOG(message_group::NONE,,"path size %1$i",fs::stringy(path).size());
     // LOG(message_group::NONE,,"lib path found: [%1$s]",path);
     if (path.empty()) return "";
@@ -149,7 +151,9 @@ std::string PlatformUtils::backupPath()
     if (pathstr == "") return "";
     path = fs::path(pathstr);
     if (!fs::exists(path)) return "";
+#ifndef __EMSCRIPTEN__
     path = fs::canonical(path);
+#endif
     if (path.empty()) return "";
     path /= OPENSCAD_FOLDER_NAME;
     path /= "backups";