which: simplify, like Ffilesystem

Author: scivision

+stdlib/which.m

@@ -12,25 +12,17 @@
   use_java (1,1) logical = false
 end
 
-names = filename;
-
-if ispc
-  % Windows executable filename doesn't necessarily need .exe,
-  % particularly for WSL executables that is_exe() will detect from
-  % native Windows Matlab.
-  if ~endsWith(lower(filename), ".exe")
-    names(2) = filename + ".exe";
-  end
-end
-
-% directory/filename given
-for exe = names
+exe = string.empty;
 
-  if stdlib.is_absolute(exe, use_java) && stdlib.is_exe(exe, use_java)
-    return
-  end
+if stdlib.is_exe(filename, use_java)
+  exe = stdlib.posix(filename);
+  return
+end
 
-end % for exe
+%  relative directory component, but path was not a file
+if stdlib.filename(filename) ~= filename
+  return
+end
 
 % path given
 
@@ -40,18 +32,13 @@
 end
 fpath = fpath(strlength(fpath)>0);
 
-for name = names
-
-  for p = fpath
-    exe = stdlib.posix(p) + "/" + name;
-    if stdlib.is_exe(exe, use_java)
-      return
-    end
+for p = fpath
+  e = p + "/" + filename;
+  if stdlib.is_exe(e, use_java)
+    exe = stdlib.posix(e);
+    return
   end
-
-end % for name
-
-exe = string.empty;
+end
 
 end
 

test/TestWhich.m

@@ -35,13 +35,11 @@ function test_is_exe_which_fullpath(tc, use_java)
 
 n = "matlab";
 %% is_exe test
-p = fullfile(matlabroot, "bin", n);
+p = matlabroot + "/bin/" + n;
 if ispc
-  fp = p + ".exe";
-else
-  fp = p;
+  p = p + ".exe";
 end
-tc.verifyTrue(stdlib.is_exe(fp, use_java))
+tc.verifyTrue(stdlib.is_exe(p, use_java))
 %% which: test absolute path
 exe = stdlib.which(p, getenv('PATH'), use_java);