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

additions to changes for #6, don't count removal of non-existing files

Browse Source
This commit is contained in:
Steffen Schuemann 2019-03-06 07:05:10 +01:00
parent b98a74ab1d
commit 036cf96bb6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
filesystem.h
View File

@ -3712,12 +3712,14 @@ inline uintmax_t remove_all(const path& p, std::error_code& ec) noexcept
} }
} }
if(!ec) { if(!ec) {
remove(p, ec); if(remove(p, ec)) {
++count;
}
} }
if (ec) { if (ec) {
return static_cast<uintmax_t>(-1); return static_cast<uintmax_t>(-1);
} }
return ++count; return count;
} }
inline void rename(const path& from, const path& to) inline void rename(const path& from, const path& to)

1
test/filesystem_test.cpp
View File

@ -2028,6 +2028,7 @@ TEST_CASE("30.10.15.31 remove_all", "[filesystem][operations][fs.op.remove_all]"
generateFile("dir1/dir1b/f2"); generateFile("dir1/dir1b/f2");
CHECK_NOTHROW(fs::remove_all("dir1/non-existing", ec)); CHECK_NOTHROW(fs::remove_all("dir1/non-existing", ec));
CHECK(!ec); CHECK(!ec);
CHECK(fs::remove_all("dir1/non-existing", ec) == 0);
CHECK(fs::remove_all("dir1") == 5); CHECK(fs::remove_all("dir1") == 5);
CHECK(fs::directory_iterator(t.path()) == fs::directory_iterator()); CHECK(fs::directory_iterator(t.path()) == fs::directory_iterator());
} }