Skip to content

Commit eafd3ec

Browse files
committed
canonical: default non-java
1 parent b8e4592 commit eafd3ec

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

+stdlib/canonical.m

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
arguments
1919
p (1,1) string
2020
expand_tilde (1,1) logical = true
21-
use_java (1,1) logical = true
21+
use_java (1,1) logical = false
2222
end
2323

2424
if expand_tilde
@@ -33,10 +33,6 @@
3333
end
3434

3535
e = stdlib.exists(c);
36-
if ~e && ~stdlib.has_java
37-
% _canonicalizepath errors if path does not exist
38-
return
39-
end
4036

4137
if ~stdlib.is_absolute(c)
4238
if e
@@ -50,12 +46,13 @@
5046
end
5147
end
5248

53-
if use_java && stdlib.has_java
54-
% we use has_java check because default is use_java
49+
if use_java
5550
c = java.io.File(c).getCanonicalPath();
56-
else
57-
% similar benchmark time as java method
51+
elseif e && ~startsWith(c, "~")
52+
% errors if path does not exist. Errors on leading ~
5853
c = builtin('_canonicalizepath', c);
54+
else
55+
c = stdlib.normalize(c, use_java);
5956
end
6057

6158
c = stdlib.posix(c);

0 commit comments

Comments
 (0)