read_symlink: no posix

Author: scivision

+stdlib/read_symlink.m

@@ -7,31 +7,28 @@
   p {mustBeTextScalar}
 end
 
-r = "";
 
 try
-  [ok, t] = isSymbolicLink(p);
-  if ~ok, return, end
+  [ok, r] = isSymbolicLink(p);
+  if ~ok, r = ""; end
 catch e
   switch e.identifier
-    case "Octave:undefined-function", t = readlink(p);
+    case "Octave:undefined-function", r = readlink(p);
     case "MATLAB:UndefinedFunction"
-      if ~stdlib.is_symlink(p)
-        return
+      if stdlib.is_symlink(p)
+        % must be absolute path
+        % must not be .canonical or symlink is gobbled!
+        r = stdlib.absolute(p, "", false);
+
+        % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/nio/file/Files.html#readSymbolicLink(java.nio.file.Path)
+        r = java.nio.file.Files.readSymbolicLink(javaPathObject(r)).string;
+      else
+        r = "";
       end
-
-      % must be absolute path
-      % must not be .canonical or symlink is gobbled!
-      r = stdlib.absolute(p, "", false);
-
-      % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/nio/file/Files.html#readSymbolicLink(java.nio.file.Path)
-      t = java.nio.file.Files.readSymbolicLink(javaPathObject(r));
     otherwise, rethrow(e)
   end
 end
 
-r = stdlib.posix(t);
-
 end
 
 %!test

src/symlink_fs.cpp

@@ -76,7 +76,7 @@ std::string fs_read_symlink(std::string_view path)
 #else
   std::error_code ec;
   if(auto p = std::filesystem::read_symlink(path, ec); !ec)
-    return p.generic_string();
+    return p.string();
 #endif
 
   return {};

src/windows.cpp

@@ -137,9 +137,7 @@ std::string fs_win32_final_path(std::string_view path)
 #else  // C++98
   if (r.substr(0, 4) == "\\\\?\\")
 #endif
-    r = r.substr(4);
-
-  return fs_as_posix(r);
+    return r.substr(4);
 #else
   return std::string(path);
 #endif

test/TestSymlink.m

@@ -17,9 +17,9 @@ function setup_symlink(tc)
 
 tc.tempDir = tc.createTemporaryFolder();
 
-tc.link = tc.tempDir + "/my.lnk";
+tc.link = fullfile(tc.tempDir, "my.lnk");
 
-tc.target = stdlib.posix(mfilename("fullpath") + ".m");
+tc.target = mfilename("fullpath") + ".m";
 
 tc.assumeTrue(stdlib.create_symlink(tc.target, tc.link), ...
     "failed to create test link " + tc.link)