diff options
| author | Ville Voutilainen <ville.voutilainen@gmail.com> | 2016-07-04 15:52:49 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville@gcc.gnu.org> | 2016-07-04 15:52:49 +0300 |
| commit | e12880f96fa42ce889c08d51876cf782afe11aa4 (patch) | |
| tree | 38bed5547602f37fd3a38f274d966a8ef1d304dc | |
| parent | cbe91164ce7fd929b56327e72d8e7154f01ef2ec (diff) | |
| download | gcc-e12880f96fa42ce889c08d51876cf782afe11aa4.zip gcc-e12880f96fa42ce889c08d51876cf782afe11aa4.tar.gz gcc-e12880f96fa42ce889c08d51876cf782afe11aa4.tar.bz2 | |
re PR libstdc++/71313 ([Filesystem TS] remove_all fails to remove directory contents recursively)
PR libstdc++/71313
* src/filesystem/ops.cc (remove_all(const path&, error_code&)):
Call remove_all for children of a directory.
* testsuite/experimental/filesystem/operations/create_directories.cc:
Adjust.
From-SVN: r237978
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/src/filesystem/ops.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 53d0405..92d7a4d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2016-07-04 Ville Voutilainen <ville.voutilainen@gmail.com> + + PR libstdc++/71313 + * src/filesystem/ops.cc (remove_all(const path&, error_code&)): + Call remove_all for children of a directory. + * testsuite/experimental/filesystem/operations/create_directories.cc: + Adjust. + 2016-07-02 François Dumont <fdumont@gcc.gnu.org> * testsuite/23_containers/array/tuple_interface/get_debug_neg.cc: Adjust diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc index 67ed8e6..9fb5b63 100644 --- a/libstdc++-v3/src/filesystem/ops.cc +++ b/libstdc++-v3/src/filesystem/ops.cc @@ -1194,7 +1194,7 @@ fs::remove_all(const path& p, error_code& ec) noexcept uintmax_t count = 0; if (ec.value() == 0 && fs.type() == file_type::directory) for (directory_iterator d(p, ec), end; ec.value() == 0 && d != end; ++d) - count += fs::remove(d->path(), ec); + count += fs::remove_all(d->path(), ec); if (ec.value()) return -1; return fs::remove(p, ec) ? ++count : -1; // fs:remove() calls ec.clear() diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc index 4be41a6..a52efe4 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc @@ -65,7 +65,8 @@ test01() VERIFY( b ); VERIFY( is_directory(p/"./d4/../d5") ); - remove_all(p, ec); + std::uintmax_t count = remove_all(p, ec); + VERIFY( count == 6 ); } int |