git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backport: re PR libstdc++/71313 ([Filesystem TS] remove_all fails to remove directory contents recursively) 

Backport from mainline
        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.

From-SVN: r237981
This commit is contained in:
Ville Voutilainen 2016-07-04 16:52:21 +03:00 committed by Ville Voutilainen
parent 021de257a6
commit 4b386db092
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,14 @@
2016-07-04 Ville Voutilainen <ville.voutilainen@gmail.com>
Backport from mainline
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-06-03 Release Manager 2016-06-03 Release Manager
* GCC 5.4.0 released. * GCC 5.4.0 released.

2
libstdc++-v3/src/filesystem/ops.cc
View File

@ -1172,7 +1172,7 @@ fs::remove_all(const path& p, error_code& ec) noexcept
uintmax_t count = 0; uintmax_t count = 0;
if (ec.value() == 0 && fs.type() == file_type::directory) if (ec.value() == 0 && fs.type() == file_type::directory)
for (directory_iterator d(p, ec), end; ec.value() == 0 && d != end; ++d) 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()) if (ec.value())
return -1; return -1;
return fs::remove(p, ec) ? ++count : -1; // fs:remove() calls ec.clear() return fs::remove(p, ec) ? ++count : -1; // fs:remove() calls ec.clear()

3
libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc
View File

@ -65,7 +65,8 @@ test01()
VERIFY( b ); VERIFY( b );
VERIFY( is_directory(p/"./d4/../d5") ); VERIFY( is_directory(p/"./d4/../d5") );
remove_all(p, ec); std::uintmax_t count = remove_all(p, ec);
VERIFY( count == 6 );
} }
int int