Simplify

Author: kleisauke

src/lib/libsigs.js

@@ -411,6 +411,7 @@ sigs = {
   _wasmfs_node_insert_directory__sig: 'ipi',
   _wasmfs_node_insert_file__sig: 'ipi',
   _wasmfs_node_open__sig: 'ipp',
+  _wasmfs_node_path_get_root__sig: 'ippi',
   _wasmfs_node_read__sig: 'iipiip',
   _wasmfs_node_readdir__sig: 'ipp',
   _wasmfs_node_readlink__sig: 'ippi',

src/lib/libwasmfs_node.js

@@ -224,14 +224,9 @@ addToLibrary({
     });
   },
 
-  _wasmfs_node_path_is_abs__deps: ['$nodePath'],
-  _wasmfs_node_path_is_abs: (path_p) => {
-    return nodePath.isAbsolute(UTF8ToString(path_p));
-  },
-
   _wasmfs_node_path_get_root__deps: ['$nodePath'],
-  _wasmfs_node_path_get_root: (abs_path_p, target_p, bufsize) => {
-    return stringToUTF8(nodePath.parse(UTF8ToString(abs_path_p)).root, target_p, bufsize);
+  _wasmfs_node_path_get_root: (path_p, target_p, bufsize) => {
+    return stringToUTF8(nodePath.parse(UTF8ToString(path_p)).root, target_p, bufsize);
   },
 
 });

system/lib/wasmfs/backend.h

@@ -21,8 +21,7 @@ class Backend {
   virtual std::shared_ptr<Directory> createDirectory(mode_t mode) = 0;
   virtual std::shared_ptr<Symlink> createSymlink(std::string target) = 0;
 
-  virtual bool isAbsolutePath(std::string_view path) = 0;
-  virtual std::string getRootPath(std::string_view abs_path) = 0;
+  virtual std::string getRootPath(std::string_view path) = 0;
 
   virtual ~Backend() = default;
 };

system/lib/wasmfs/backends/ignore_case_backend.cpp

@@ -226,12 +226,8 @@ class IgnoreCaseBackend : public Backend {
     return virtualize(backend->createSymlink(target), this);
   }
 
-  bool isAbsolutePath(std::string_view path) override {
-    return path.front() == '/';
-  }
-
-  std::string getRootPath(std::string_view abs_path) override {
-    return "/";
+  std::string getRootPath(std::string_view path) override {
+    return path.front() == '/' ? "/" : "";
   }
 };
 

system/lib/wasmfs/backends/memory_backend.cpp

@@ -104,11 +104,8 @@ class MemoryBackend : public Backend {
   std::shared_ptr<Symlink> createSymlink(std::string target) override {
     return std::make_shared<MemorySymlink>(target, this);
   }
-  bool isAbsolutePath(std::string_view path) override {
-    return path.front() == '/';
-  }
-  std::string getRootPath(std::string_view abs_path) override {
-    return "/";
+  std::string getRootPath(std::string_view path) override {
+    return path.front() == '/' ? "/" : "";
   }
 };
 

system/lib/wasmfs/backends/node_backend.cpp

@@ -297,14 +297,10 @@ class NodeBackend : public Backend {
     WASMFS_UNREACHABLE("TODO: implement NodeBackend::createSymlink");
   }
 
-  bool isAbsolutePath(std::string_view path) override {
-    return _wasmfs_node_path_is_abs(std::string(path).c_str());
-  }
-
-  std::string getRootPath(std::string_view abs_path) override {
+  std::string getRootPath(std::string_view path) override {
     char buf[PATH_MAX];
-    auto path = std::string(abs_path);
-    if (_wasmfs_node_path_get_root(path.c_str(), buf, PATH_MAX) < 0) {
+    auto pathStr = std::string(path);
+    if (_wasmfs_node_path_get_root(pathStr.c_str(), buf, PATH_MAX) < 0) {
       WASMFS_UNREACHABLE("getRootPath cannot fail");
     }
     return std::string(buf);

system/lib/wasmfs/backends/node_backend.h

@@ -52,7 +52,6 @@ int _wasmfs_node_read(
 int _wasmfs_node_write(
   int fd, const void* buf, uint32_t len, uint32_t pos, uint32_t* nwritten);
 
-int _wasmfs_node_path_is_abs(const char* path);
-int _wasmfs_node_path_get_root(const char* abs_path, const char *buf, int bufsize);
+int _wasmfs_node_path_get_root(const char* path, const char *buf, int bufsize);
 
 } // extern "C"

system/lib/wasmfs/backends/opfs_backend.cpp

@@ -394,12 +394,8 @@ class OPFSBackend : public Backend {
     return nullptr;
   }
 
-  bool isAbsolutePath(std::string_view path) override {
-    return path.front() == '/';
-  }
-
-  std::string getRootPath(std::string_view abs_path) override {
-    return "/";
+  std::string getRootPath(std::string_view path) override {
+    return path.front() == '/' ? "/" : "";
   }
 };
 

system/lib/wasmfs/js_impl_backend.h

@@ -120,11 +120,8 @@ class JSImplBackend : public Backend {
   std::shared_ptr<Symlink> createSymlink(std::string target) override {
     return std::make_shared<MemorySymlink>(target, this);
   }
-  bool isAbsolutePath(std::string_view path) override {
-    return path.front() == '/';
-  }
-  std::string getRootPath(std::string_view abs_path) override {
-    return "/";
+  std::string getRootPath(std::string_view path) override {
+    return path.front() == '/' ? "/" : "";
   }
 };
 

system/lib/wasmfs/paths.cpp

@@ -69,12 +69,12 @@ ParsedParent doParseParent(std::string_view path,
     return {-ENOENT};
   }
 
-  auto currBackend = curr->getBackend();
+  auto rootPath = curr->getBackend()->getRootPath(path);
 
   // Handle absolute paths.
-  if (currBackend->isAbsolutePath(path)) {
+  if (!rootPath.empty()) {
     curr = wasmFS.getRootDirectory();
-    path.remove_prefix(currBackend->getRootPath(path).size());
+    path.remove_prefix(rootPath.size());
   }
 
   // Ignore trailing '/'.