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

Merge branch 'development-v1.1' of https://github.com/gulrak/filesystem into development-v1.1

Browse Source
This commit is contained in:
Steffen Schümann 2019-05-06 08:44:49 +02:00
commit 28e7497f8d
2 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/ghc/filesystem.hpp
View File

@ -149,7 +149,7 @@
#define LWG_2937_BEHAVIOUR #define LWG_2937_BEHAVIOUR
// ghc::filesystem version in decimal (major * 10000 + minor * 100 + patch) // ghc::filesystem version in decimal (major * 10000 + minor * 100 + patch)
#define GHC_FILESYSTEM_VERSION 10100L #define GHC_FILESYSTEM_VERSION 10101L
namespace ghc { namespace ghc {
namespace filesystem { namespace filesystem {
@ -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;
} }
@ -4882,6 +4887,7 @@ GHC_INLINE recursive_directory_iterator& recursive_directory_iterator::increment
_impl->_dir_iter_stack.pop(); _impl->_dir_iter_stack.pop();
_impl->_dir_iter_stack.top().increment(ec); _impl->_dir_iter_stack.top().increment(ec);
} }
_impl->_recursion_pending = true;
return *this; return *this;
} }

39
test/filesystem_test.cpp
View File

@ -802,6 +802,13 @@ 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");
CHECK(fs::path("a/b/../../../c").lexically_normal() == "../c");
#ifdef GHC_OS_WINDOWS
CHECK(fs::path("\\/\\///\\/").lexically_normal() == "/");
CHECK(fs::path("a/b/..\\//..///\\/../c\\\\/").lexically_normal() == "../c/");
CHECK(fs::path("..a/b/..\\//..///\\/../c\\\\/").lexically_normal() == "../c/");
#endif
// 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");
@ -1221,6 +1228,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]")
@ -2302,9 +2332,18 @@ TEST_CASE("30.10.15.38 temporary_directory_path", "[filesystem][operations][fs.o
TEST_CASE("30.10.15.39 weakly_canonical", "[filesystem][operations][fs.op.weakly_canonical]") TEST_CASE("30.10.15.39 weakly_canonical", "[filesystem][operations][fs.op.weakly_canonical]")
{ {
INFO("This might fail on std::implementations that return fs::current_path() for fs::canonical(\"\")");
CHECK(fs::weakly_canonical("") == ".");
if(fs::weakly_canonical("") == ".") {
CHECK(fs::weakly_canonical("foo/bar") == "foo/bar"); CHECK(fs::weakly_canonical("foo/bar") == "foo/bar");
CHECK(fs::weakly_canonical("foo/./bar") == "foo/bar"); CHECK(fs::weakly_canonical("foo/./bar") == "foo/bar");
CHECK(fs::weakly_canonical("foo/../bar") == "bar"); CHECK(fs::weakly_canonical("foo/../bar") == "bar");
}
else {
CHECK(fs::weakly_canonical("foo/bar") == fs::current_path() / "foo/bar");
CHECK(fs::weakly_canonical("foo/./bar") == fs::current_path() / "foo/bar");
CHECK(fs::weakly_canonical("foo/../bar") == fs::current_path() / "bar");
}
{ {
TemporaryDirectory t(TempOpt::change_path); TemporaryDirectory t(TempOpt::change_path);