mex: drop_slash(), is_url()

mex: require <filesystem>

mex: consolidate headers

Author: scivision

+stdlib/windows_shortname.m

@@ -13,22 +13,23 @@
 end
 
 s = "";
+if stdlib.is_url(p), return, end
 
-if ~ispc || stdlib.is_url(p)
-  return
-end
+s = p;
+if ispc
+  fso = actxserver('Scripting.FileSystemObject');
 
-fso = actxserver('Scripting.FileSystemObject');
+  if isfolder(p)
+    s = fso.GetFolder(p).ShortPath;
+  elseif isfile(p)
+    s = fso.GetFile(p).ShortPath;
+  end
 
-if isfolder(p)
-  s = fso.GetFolder(p).ShortPath;
-elseif isfile(p)
-  s = fso.GetFile(p).ShortPath;
+  delete(fso);
 end
 
 s = string(s);
 
-delete(fso);
 
 end
 

buildfile.m

@@ -83,12 +83,10 @@ function publishTask(context)
 
 function srcs = get_mex_sources()
 
-limits = "src/limits_fs.cpp";
+pure = "src/pure.cpp";
+normal = ["src/normalize.cpp", pure];
 
-win = limits;
-if ispc
-win(end+1) = "src/windows.cpp";
-end
+win = [pure, "src/windows.cpp"];
 
 mac = "src/macos.cpp";
 linux = "src/linux_fs.cpp";
@@ -103,6 +101,7 @@ function publishTask(context)
 "src/set_permissions.cpp", ...
 ["src/is_rosetta.cpp", mac], ...
 ["src/windows_shortname.cpp", win], ...
+["src/drop_slash.cpp", normal], ...
 };
 
 %%  new in R2024b

octave_build.m

@@ -9,6 +9,7 @@
 
 %% specific source
 srcs = {
+fullfile(d, "drop_slash.cpp"), ...
 fullfile(d, "is_wsl.cpp"), ...
 fullfile(d, "is_rosetta.cpp"), ...
 fullfile(d, "is_admin.cpp"), ...

src/admin_fs.cpp

@@ -6,7 +6,7 @@
 #include <sys/types.h>  // geteuid, pid_t
 #endif
 
-#include "admin_fs.h"
+#include "ffilesystem.h"
 
 
 bool fs_is_admin(){

src/admin_fs.h

@@ -6,7 +6,7 @@
 #include <vector>
 #include <memory>
 
-#include "symlink_fs.h"
+#include "ffilesystem.h"
 
 
 class MexFunction : public matlab::mex::Function {
@@ -21,7 +21,7 @@ class MexFunction : public matlab::mex::Function {
 
     if (inputs.size() != 2) {
       matlabEng->feval(u"error", 0,
-        std::vector<matlab::data::Array>({ factory.createScalar("Two inputs required") }));
+        std::vector<matlab::data::Array>({ factory.createScalar("Mex: Two inputs required") }));
     }
 
     if ((inputs[0].getType() == matlab::data::ArrayType::MATLAB_STRING && inputs[0].getNumberOfElements() == 1)){

src/create_symlink.cpp

@@ -0,0 +1,43 @@
+#include "mex.hpp"
+#include "mexAdapter.hpp"
+
+#include <string>
+
+#include <vector>
+#include <memory>
+
+#include "ffilesystem.h"
+
+
+class MexFunction : public matlab::mex::Function {
+public:
+  void operator()(matlab::mex::ArgumentList outputs, matlab::mex::ArgumentList inputs) {
+// boilerplate engine & ArrayFactory setup
+    std::shared_ptr<matlab::engine::MATLABEngine> matlabEng = getEngine();
+
+    matlab::data::ArrayFactory factory;
+
+// wrangle Inputs
+    std::string in;
+
+    if (inputs.size() != 1) {
+      matlabEng->feval(u"error", 0,
+        std::vector<matlab::data::Array>({ factory.createScalar("Mex: One input required") }));
+    }
+    if ((inputs[0].getType() == matlab::data::ArrayType::MATLAB_STRING && inputs[0].getNumberOfElements() == 1)){
+        matlab::data::TypedArray<matlab::data::MATLABString> stringArr = inputs[0];
+        in = stringArr[0];
+    } else if (inputs[0].getType() == matlab::data::ArrayType::CHAR){
+        matlab::data::CharArray charArr = inputs[0];
+        in.assign(charArr.begin(), charArr.end());
+    } else {
+        matlabEng->feval(u"error", 0,
+        std::vector<matlab::data::Array>({ factory.createScalar("Mex: First input must be a scalar string or char vector") }));
+    }
+
+// actual function algorithm / computation
+    std::string out = fs_drop_slash(in);
+
+    outputs[0] = factory.createScalar(out);
+  }
+};

src/drop_slash.cpp

@@ -0,0 +1,20 @@
+#include <string>
+#include <string_view>
+#include <cstddef>
+
+bool fs_is_windows();
+std::size_t fs_get_max_path();
+std::string fs_as_posix(std::string_view);
+std::string fs_drop_slash(std::string_view);
+std::string fs_as_posix(std::string_view);
+
+bool fs_is_url(std::string_view);
+int fs_is_wsl();
+bool fs_is_rosetta();
+bool fs_is_admin();
+bool fs_is_symlink(std::string_view);
+bool fs_create_symlink(std::string_view, std::string_view);
+std::string fs_read_symlink(std::string_view);
+
+bool fs_win32_is_symlink(std::string_view);
+std::string fs_shortname(std::string_view);

src/ffilesystem.h

@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 
-#include "admin_fs.h"
+#include "ffilesystem.h"
 
 
 class MexFunction : public matlab::mex::Function {

src/is_admin.cpp

@@ -1,10 +1,3 @@
-// C++ Matlab MEX function using C++17 <filesystem>
-// build examples:
-// * MSVC: mex COMPFLAGS="/EHsc /std:c++17" is_char_device.cpp
-// * GCC: mex CXXFLAGS="-std=c++17" is_char_device.cpp
-
-// https://www.mathworks.com/help/matlab/matlab_external/data-types-for-passing-mex-function-data-1.html
-
 #include "mex.hpp"
 #include "mexAdapter.hpp"
 
@@ -17,22 +10,11 @@
 #if defined(_MSC_VER)
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
-#elif __has_include(<filesystem>)
+#else
 # include <filesystem>
 # include <system_error>
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-
-static int fs_st_mode(std::string_view path)
-{
-// https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/stat-functions
-  struct stat s;
-
-  return stat(path.data(), &s) == 0 ? s.st_mode : 0;
-}
-
 
 static bool fs_is_char_device(std::string_view path)
 {
@@ -48,12 +30,9 @@ static bool fs_is_char_device(std::string_view path)
   const DWORD type = GetFileType(h);
   CloseHandle(h);
   return type == FILE_TYPE_CHAR;
-#elif defined(__cpp_lib_filesystem)
+#else
   std::error_code ec;
   return std::filesystem::is_character_file(path, ec) && !ec;
-#else
-  // Windows: https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/fstat-fstat32-fstat64-fstati64-fstat32i64-fstat64i32
-  return S_ISCHR(fs_st_mode(path));
 #endif
 }
 
@@ -70,7 +49,7 @@ class MexFunction : public matlab::mex::Function {
 
     if (inputs.size() != 1) {
       matlabEng->feval(u"error", 0,
-        std::vector<matlab::data::Array>({ factory.createScalar("One input required") }));
+        std::vector<matlab::data::Array>({ factory.createScalar("Mex: One input required") }));
     }
     if ((inputs[0].getType() == matlab::data::ArrayType::MATLAB_STRING && inputs[0].getNumberOfElements() == 1)){
         matlab::data::TypedArray<matlab::data::MATLABString> stringArr = inputs[0];