is_exe: file or directory can be executable

Author: scivision

+stdlib/is_exe.m

@@ -10,12 +10,6 @@
 end
 
 
-ok = false;
-
-if ~isfile(p)
-  return
-end
-
 if use_java
 % about the same time as fileattrib
 % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/io/File.html#canExecute()
@@ -26,6 +20,11 @@
 
 else
 
+if ~stdlib.len(p)
+  ok = false;
+  return
+end
+
 [status, v] = fileattrib(p);
 
 ok = status ~= 0 && (v.UserExecute || (~isnan(v.GroupExecute) && v.GroupExecute) || (~isnan(v.OtherExecute) && v.OtherExecute));
@@ -36,4 +35,5 @@
 
 %!assert (!is_exe(''))
 %!assert (!is_exe(tempname))
+%!assert (is_exe("."))
 %!assert (is_exe(program_invocation_name))

+stdlib/is_symlink.m

@@ -1,11 +1,13 @@
 %% IS_SYMLINK is path a symbolic link
-%
+% on Windows, distinguishes between symlinks and App Execution Aliases,
+% which are not symlinks.
 
 function ok = is_symlink(p)
 arguments
   p (1,1) string
 end
 
+
 try
   ok = isSymbolicLink(p);
 catch e

+stdlib/which.m

@@ -14,7 +14,7 @@
 
 exe = string.empty;
 
-if stdlib.is_exe(filename, use_java)
+if isfile(filename) && stdlib.is_exe(filename, use_java)
   exe = stdlib.posix(filename);
   return
 end
@@ -34,7 +34,7 @@
 
 for p = fpath
   e = p + "/" + filename;
-  if stdlib.is_exe(e, use_java)
+  if isfile(e) && stdlib.is_exe(e, use_java)
     exe = stdlib.posix(e);
     return
   end

test/TestIsExe.m

@@ -0,0 +1,27 @@
+classdef TestIsExe < matlab.unittest.TestCase
+
+properties (TestParameter)
+p = init_is_exe()
+use_java = num2cell(unique([stdlib.has_java(), false]))
+end
+
+methods(Test)
+function test_is_exe(tc, p, use_java)
+tc.verifyEqual(stdlib.is_exe(p{1}, use_java), p{2})
+end
+end
+end
+
+
+function p = init_is_exe()
+
+n = "matlab";
+
+f = matlabroot + "/bin/" + n;
+if ispc
+  f = f + ".exe";
+end
+
+
+p = {{"", false}, {tempname, false}, {".", true}, {f, true}};
+end

test/TestWhich.m

@@ -26,22 +26,19 @@ function test_which_name(tc, use_java)
 end
 
 
-function test_is_exe_which_fullpath(tc, use_java)
+function test_which_fullpath(tc, use_java)
 import matlab.unittest.constraints.IsFile
 import matlab.unittest.constraints.EndsWithSubstring
 
-tc.verifyFalse(stdlib.is_exe("", use_java))
-tc.verifyFalse(stdlib.is_exe(tempname, use_java))
-
 n = "matlab";
 %% is_exe test
 p = matlabroot + "/bin/" + n;
 if ispc
   p = p + ".exe";
 end
-tc.verifyTrue(stdlib.is_exe(p, use_java))
+tc.assumeTrue(stdlib.is_exe(p, use_java), "Matlab not executable " + p)
 %% which: test absolute path
-exe = stdlib.which(p, getenv('PATH'), use_java);
+exe = stdlib.which(p, [], use_java);
 
 if ispc
   tc.verifyThat(exe, EndsWithSubstring(".exe"))