improve use of stat()

Author: scivision

+stdlib/file_size.m

@@ -10,15 +10,17 @@
   p {mustBeTextScalar,mustBeFile}
 end
 
+s = [];
+
 if stdlib.isoctave()
-  s = stat(p);
-  if ~isempty(s)
-    s = s.size;
+  [st, err] = stat(p);
+  if err == 0
+    s = st.size;
   end
 else
-  s = dir(p);
-  if ~isempty(s)
-    s = s.bytes;
+  d = dir(p);
+  if ~isempty(d)
+    s = d.bytes;
   end
 end
 

+stdlib/get_modtime.m

@@ -13,11 +13,11 @@
 
 
 if stdlib.isoctave()
-  s = stat(p);
-  if isempty(s)
-    t = [];
-  else
+  [s, err] = stat(p);
+  if err == 0
     t = s.mtime;
+  else
+    t = [];
   end
   return
 end

+stdlib/get_permissions.m

@@ -15,8 +15,9 @@
   switch e.identifier
     case "MATLAB:io:filesystem:filePermissions:CannotFindLocation", return
     case "Octave:undefined-function"
-      try  %#ok<TRYNC>
-        p = stat(f).modestr;
+      [s, err] = stat(f);
+      if err == 0
+        p = s.modestr;
       end
       return
     case "MATLAB:UndefinedFunction"

+stdlib/hard_link_count.m

@@ -13,8 +13,8 @@
 c = [];
 
 if stdlib.isoctave()
-  s = stat(p);
-  if ~isempty(s)
+  [s, err] = stat(p);
+  if err == 0
     c = s.nlink;
   end
 elseif ispc() || ~isfile(p)

+stdlib/is_char_device.m

@@ -10,7 +10,8 @@
 end
 
 if stdlib.isoctave()
-  ok = S_ISCHR(stat(p).mode);
+  [s, err] = stat(p);
+  ok = err == 0 && S_ISCHR(s.mode);
 else
   error("buildtool mex")
 end

+stdlib/is_symlink.m

@@ -12,7 +12,9 @@
 catch e
   switch e.identifier
     case "MATLAB:UndefinedFunction", ok = java.nio.file.Files.isSymbolicLink(javaPathObject(stdlib.absolute(p)));
-    case "Octave:undefined-function", ok = S_ISLNK(stat(p).mode);
+    case "Octave:undefined-function"
+      [s, err] = stat(p);
+      ok = err == 0 && S_ISLNK(s.mode);
     otherwise, rethrow(e)
   end
 end

+stdlib/samepath.m

@@ -9,11 +9,8 @@
 %
 %%% Inputs
 % * path1, path2: paths to compare
-%%% Outputs
-% issame: logical
 
-
-function issame = samepath(path1, path2)
+function y = samepath(path1, path2)
 arguments
   path1 {mustBeTextScalar}
   path2 {mustBeTextScalar}
@@ -22,9 +19,19 @@
 % simpler our way than
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/nio/file/Files.html#isSameFile(java.nio.file.Path,java.nio.file.Path)
 
-issame = stdlib.exists(path1) && stdlib.exists(path2) && ...
-         strcmp(stdlib.canonical(path1), stdlib.canonical(path2));
+y = stdlib.exists(path1) && stdlib.exists(path2);
+
+if ~y, return; end
+
+if ~ispc() && stdlib.isoctave()
+  [r1, e1] = stat(path1);
+  [r2, e2] = stat(path2);
+
+  y = e1 == 0 && e2 == 0 && ...
+      r1.ino == r2.ino && r1.dev == r2.dev;
 
+else
+  y = strcmp(stdlib.canonical(path1), stdlib.canonical(path2));
 end
 
 %!assert(samepath(".", "."))