GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-07-24 02:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

lexically_relative: ignore trailing slash on base

Browse Source 
Previously,

    fs::path("a/b").lexically_relative("a/")

would incorrectly return "../b". Now it returns "b".
This commit is contained in:
Michael M 2020-03-22 16:26:59 -07:00
parent 26077f272e
commit e3201da883
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ghc/filesystem.hpp
View File

@ -2683,7 +2683,7 @@ GHC_INLINE path path::lexically_relative(const path& base) const
}
int count = 0;
for (const auto& element : input_iterator_range<const_iterator>(b, base.end())) {
if (element != "." && element != "..") {
if (element != "." && element != "" && element != "..") {
++count;
}
else if (element == "..") {

1
test/filesystem_test.cpp
View File

@ -882,6 +882,7 @@ TEST_CASE("30.10.8.4.11 path generation", "[filesystem][path][fs.path.gen]")
CHECK(fs::path("a/b/c").lexically_relative("a/b/c/x/y") == "../..");
CHECK(fs::path("a/b/c").lexically_relative("a/b/c") == ".");
CHECK(fs::path("a/b").lexically_relative("c/d") == "../../a/b");
CHECK(fs::path("a/b").lexically_relative("a/") == "b");
if (has_host_root_name_support()) {
CHECK(fs::path("//host1/foo").lexically_relative("//host2.bar") == "");
}