Skip to content

Commit 9d04673

Browse files
committed
further correct canonical
1 parent f89dcbd commit 9d04673

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

+stdlib/canonical.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535
if stdlib.exists(c, use_java)
3636
if stdlib.isoctave()
3737
c = canonicalize_file_name(c);
38+
elseif use_java
39+
c = javaFileObject(c).getCanonicalPath();
3840
else
39-
% errors if path does not exist. Errors on leading ~
41+
% errors if any component of path does not exist. Errors on leading ~
4042
c = builtin('_canonicalizepath', c);
4143
end
4244
elseif stdlib.len(c)

+stdlib/filesystem_type.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
%% FILESYSTEM_TYPE tell type of filesystem
22
%
33
% example outputs: ntfs, ext4, apfs, ...
4+
%
5+
% if empty output or error, try specifying the drive root
6+
% like "/" or "C:/"
47

58
function t = filesystem_type(p)
69
arguments

test/TestCanonical.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
p = {{"", ""}, {"not-exist", "not-exist"}, {"a/../b", "b"}, ...
77
{"~", stdlib.homedir()}, {"~/", stdlib.homedir()}, ...
88
{"~/..", stdlib.parent(stdlib.homedir())}, ...
9-
{mfilename("fullpath") + "/..", stdlib.parent(mfilename("fullpath"))}};
9+
{mfilename("fullpath") + ".m/..", stdlib.parent(mfilename("fullpath"))}};
1010
end
1111

1212

test/TestJava.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function test_java_version(tc)
4747

4848
function test_java_api(tc)
4949
v = stdlib.java_api();
50-
tc.verifyGreaterThanOrEqual(v, 8)
50+
tc.verifyGreaterThanOrEqual(v, 8, "Java API >= 8 is required for Matlab-stdlib")
5151
end
5252

5353

0 commit comments

Comments
 (0)