canonical: simplify with builtin

Author: scivision

+stdlib/canonical.m

@@ -16,28 +16,16 @@
   p {mustBeTextScalar}
 end
 
-c = "";
-
-if ~strlength(p) || (ispc() && (startsWith(p, {'\\', '//'})))
-  % UNC path is not canonicalized
-  return
-end
-
-if stdlib.isoctave()
-% empty if any component of path does not exist
-  c = canonicalize_file_name(p);
+if strempty(p)
+  c = '';
 else
-% errors if any component of path does not exist.
-% disp("builtin")
-  try %#ok<TRYNC>
-    c = builtin('_canonicalizepath', p);
-  end
-end
-
-c = stdlib.posix(c);
+  [s, r] = fileattrib(p);
 
-if ~strlength(c)
-  c = stdlib.normalize(p);
+  if s == 1
+    c = stdlib.posix(r.Name);
+  else
+    c = stdlib.normalize(p);
+  end
 end
 
 if isstring(p)
@@ -47,4 +35,4 @@
 end
 
 %!assert(canonical(""), "")
-%!assert(canonical("~"), homedir())
+%!assert(canonical("."), pwd())

+stdlib/private/strempty.m

@@ -0,0 +1,10 @@
+%% STREMPTY is the char / string empty
+
+function y = strempty(s)
+arguments
+  s {mustBeTextScalar}
+end
+
+y = strlength(s) == 0;
+
+end

test/TestCanonical.m

@@ -1,11 +1,11 @@
 classdef TestCanonical < matlab.unittest.TestCase
 
 properties(TestParameter)
-p = {{'', ""}, ...
+p = {{'', ''}, ...
 {"", ""}, ...
 {"not-exist", "not-exist"}, ...
 {"a/../b", "b"}, ...
-{mfilename("fullpath") + ".m/..", string(stdlib.parent(mfilename("fullpath")))}, ...
+{strcat(mfilename("fullpath"), '.m/..'), stdlib.parent(mfilename("fullpath"))}, ...
 {"not-exist/a/..", "not-exist"}, ...
 {"./not-exist", "not-exist"}, ...
 {"../not-exist", "../not-exist"}