diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2018-01-05 18:02:18 +0000 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-01-05 18:02:18 +0000 |
commit | 388058dd06b26e8f55d315b3c49b707d51c7a089 (patch) | |
tree | 3ed7c9569ed1cbe6f874fc17ea1c273eefa56808 /libstdc++-v3/src/filesystem/ops.cc | |
parent | 958d63e911b3fd4c3172e7c87b2e6b6050374f76 (diff) | |
download | gcc-388058dd06b26e8f55d315b3c49b707d51c7a089.tar.gz |
PR libstdc++/83626 handle ENOENT due to filesystem race
PR libstdc++/83626
* src/filesystem/ops.cc (remove(const path&, error_code&)): Do not
report an error for ENOENT.
(remove_all(const path&)): Fix type of result variable.
(remove_all(const path&, error_code&)): Use non-throwing increment
for directory iterator. Call POSIX remove directly to avoid redundant
calls to symlink_status. Do not report errors for ENOENT.
* src/filesystem/std-ops.cc: Likewise.
* testsuite/27_io/filesystem/operations/remove_all.cc: Test throwing
overload.
* testsuite/experimental/filesystem/operations/remove_all.cc:
Likewise.
From-SVN: r256283
Diffstat (limited to 'libstdc++-v3/src/filesystem/ops.cc')
-rw-r--r-- | libstdc++-v3/src/filesystem/ops.cc | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc index 5a7cb599bb6..3690fb94d63 100644 --- a/libstdc++-v3/src/filesystem/ops.cc +++ b/libstdc++-v3/src/filesystem/ops.cc @@ -1025,13 +1025,16 @@ fs::remove(const path& p, error_code& ec) noexcept ec.clear(); return false; // Nothing to do, not an error. } - if (::remove(p.c_str()) != 0) + if (::remove(p.c_str()) == 0) { - ec.assign(errno, std::generic_category()); - return false; + ec.clear(); + return true; } - ec.clear(); - return true; + else if (errno == ENOENT) + ec.clear(); + else + ec.assign(errno, std::generic_category()); + return false; } @@ -1039,7 +1042,7 @@ std::uintmax_t fs::remove_all(const path& p) { error_code ec; - bool result = remove_all(p, ec); + const auto result = remove_all(p, ec); if (ec) _GLIBCXX_THROW_OR_ABORT(filesystem_error("cannot remove all", p, ec)); return result; @@ -1051,15 +1054,29 @@ fs::remove_all(const path& p, error_code& ec) noexcept const auto s = symlink_status(p, ec); if (!status_known(s)) return -1; + ec.clear(); + if (s.type() == file_type::not_found) + return 0; + uintmax_t count = 0; if (s.type() == file_type::directory) - for (directory_iterator d(p, ec), end; !ec && d != end; ++d) - count += fs::remove_all(d->path(), ec); - if (!ec && fs::remove(p, ec)) + { + for (directory_iterator d(p, ec), end; !ec && d != end; d.increment(ec)) + count += fs::remove_all(d->path(), ec); + if (ec.value() == ENOENT) + ec.clear(); + else if (ec) + return -1; + } + + if (::remove(p.c_str()) == 0) ++count; - if (ec) - return -1; + else if (errno != ENOENT) + { + ec.assign(errno, std::generic_category()); + return -1; + } return count; } |