parent: handle duplicated slashes

geospace-code · Oct 7, 2024 · 590f666 · 590f666
1 parent 861082f
commit 590f666
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/+stdlib/parent.m b/+stdlib/parent.m
@@ -10,6 +10,8 @@
   % java is about 10x slower than intrinsic
   p = java.io.File(p).getParent();
 else
+  % drop duplicated slashes in the parent path
+  p = regexprep(p, "//+", "/");
   % have to drop_slash on input to get expected parent path
   p = strip(stdlib.posix(p), "right", "/");
   j = strfind(p, "/");

diff --git a/test/TestFilePure.m b/test/TestFilePure.m
@@ -17,8 +17,8 @@
 sub_is_subdir
 ref_is_subdir
 
-in_parent = {"", ".", "..", "../..", "a/b", "a/b/", "ab/.parent", "ab/.parent.txt", "a/b/../.parent.txt"}
-ref_parent = {".", ".", ".", "..",   "a",   "a",    "ab",         "ab",             "a/b/.."}
+in_parent = {"", ".", "..", "../..", "a/", "a/b", "a/b/", "ab/.parent", "ab/.parent.txt", "a/b/../.parent.txt", "a/////b////c"}
+ref_parent = {".", ".", ".", "..",   ".",  "a",   "a",    "ab",         "ab",             "a/b/..",             "a/b"}
 
 in_suffix = {"", "/foo/bar/baz", "/foo/bar/baz/", "foo/bar/baz.txt", "foo/bar/baz.txt.gz", ".stat", ".stat.txt"}
 ref_suffix = {"", "", "", ".txt", ".gz", ".stat", ".txt"}