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

Merge remote-tracking branch 'origin/master' into development-v1.1

Browse Source
This commit is contained in:
Steffen Schuemann 2019-05-03 23:40:18 +02:00
commit 96e89ae7f9
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/ghc/filesystem.hpp
View File

@ -2392,13 +2392,18 @@ GHC_INLINE path path::lexically_normal() const
path dest; path dest;
for (const string_type& s : *this) { for (const string_type& s : *this) {
if (s == ".") { if (s == ".") {
dest /= "";
continue; continue;
} }
else if (s == ".." && !dest.empty()) { else if (s == ".." && !dest.empty()) {
if (dest == root_path()) { auto root = root_path();
if (dest == root) {
continue; continue;
} }
else if (*(--dest.end()) != "..") { else if (*(--dest.end()) != "..") {
if(dest._path.back() == generic_separator) {
dest._path.pop_back();
}
dest.remove_filename(); dest.remove_filename();
continue; continue;
} }

26
test/filesystem_test.cpp
View File

@ -475,7 +475,7 @@ TEST_CASE("30.10.8.4.6 path native format observers", "[filesystem][path][fs.pat
CHECK((std::string)fs::u8path("\xc3\xa4\\\xe2\x82\xac") == std::string("\xc3\xa4\\\xe2\x82\xac")); CHECK((std::string)fs::u8path("\xc3\xa4\\\xe2\x82\xac") == std::string("\xc3\xa4\\\xe2\x82\xac"));
#endif #endif
CHECK(fs::u8path("\xc3\xa4\\\xe2\x82\xac").string() == std::string("\xc3\xa4\\\xe2\x82\xac")); CHECK(fs::u8path("\xc3\xa4\\\xe2\x82\xac").string() == std::string("\xc3\xa4\\\xe2\x82\xac"));
CHECK(fs::u8path("\xc3\xa4\\\xe2\x82\xac").wstring() == std::wstring(L"ä\\€")); CHECK(fs::u8path("\xc3\xa4\\\xe2\x82\xac").wstring() == std::wstring(L"\u00E4\\\u20AC"));
CHECK(fs::u8path("\xc3\xa4\\\xe2\x82\xac").u8string() == std::string("\xc3\xa4\\\xe2\x82\xac")); CHECK(fs::u8path("\xc3\xa4\\\xe2\x82\xac").u8string() == std::string("\xc3\xa4\\\xe2\x82\xac"));
CHECK(fs::u8path("\xc3\xa4\\\xe2\x82\xac").u16string() == std::u16string(u"\u00E4\\\u20AC")); CHECK(fs::u8path("\xc3\xa4\\\xe2\x82\xac").u16string() == std::u16string(u"\u00E4\\\u20AC"));
CHECK(fs::u8path("\xc3\xa4\\\xe2\x82\xac").u32string() == std::u32string(U"\U000000E4\\\U000020AC")); CHECK(fs::u8path("\xc3\xa4\\\xe2\x82\xac").u32string() == std::u32string(U"\U000000E4\\\U000020AC"));
@ -780,6 +780,7 @@ TEST_CASE("30.10.8.4.11 path generation", "[filesystem][path][fs.path.gen]")
CHECK(fs::path("foo/.///bar/../").lexically_normal() == "foo/"); CHECK(fs::path("foo/.///bar/../").lexically_normal() == "foo/");
CHECK(fs::path("/foo/../..").lexically_normal() == "/"); CHECK(fs::path("/foo/../..").lexically_normal() == "/");
CHECK(fs::path("foo/..").lexically_normal() == "."); CHECK(fs::path("foo/..").lexically_normal() == ".");
CHECK(fs::path("ab/cd/ef/../../qw").lexically_normal() == "ab/qw");
// lexically_relative() // lexically_relative()
CHECK(fs::path("/a/d").lexically_relative("/a/b/c") == "../../d"); CHECK(fs::path("/a/d").lexically_relative("/a/b/c") == "../../d");
@ -1199,6 +1200,29 @@ TEST_CASE("30.10.14 class recursive_directory_iterator", "[filesystem][recursive
fs::recursive_directory_iterator rd5; fs::recursive_directory_iterator rd5;
rd5 = rd4; rd5 = rd4;
} }
/*
if(1) {
fs::path d = "..";
int maxDepth = 2;
fs::recursive_directory_iterator dit(d);
std::cout << d << std::endl;
for(auto & f : dit) {
#if 1
if(dit.depth()<=maxDepth) {
std::cout << dit.depth() << ": " << f.path() << std::endl;
}
else {
dit.pop();
}
#else
std::cout << dit.depth() << ": " << f.path() << std::endl;
if(dit.depth()>maxDepth) {
dit.disable_recursion_pending();
}
#endif
}
}
*/
} }
TEST_CASE("30.10.15.1 absolute", "[filesystem][operations][fs.op.absolute]") TEST_CASE("30.10.15.1 absolute", "[filesystem][operations][fs.op.absolute]")