commit 668b28c294f454543549f898c1a20f8b19c6a105
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Wed Oct 25 00:50:56 2023 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Thu Oct 26 19:11:13 2023 -0400
tree 522f8fbac6bc4925a29aaa00c818e0f14ec2d2b7
parent 21cbcfeffb87dd62019f1d901ba68b6f7f750ae4

fileutils: use std::filesystem::remove_all, check for error

Change-Id: I46a4563e24f3a427931be886b726a585fe823eff

src/fileutils.cpp

diff --git a/src/fileutils.cpp b/src/fileutils.cpp
index 23aceff..6c75ef5 100644
--- a/src/fileutils.cpp
+++ b/src/fileutils.cpp
@@ -328,18 +328,24 @@
         return !RemoveDirectory(dhtnet::to_wstring(path.string()).c_str());
 #endif
 
-    return std::remove(path.string().c_str());
+    std::error_code ec;
+    std::filesystem::remove(path, ec);
+    return ec.value();
 }
 
 int
 removeAll(const std::filesystem::path& path, bool erase)
 {
+    std::error_code ec;
+    if (not erase) {
+        std::filesystem::remove_all(path, ec);
+        return ec.value();
+    }
     if (path.empty())
         return -1;
 
-    auto status = std::filesystem::status(path);
-    if (std::filesystem::is_directory(status) and not std::filesystem::is_symlink(status)) {
-        std::error_code ec;
+    auto status = std::filesystem::status(path, ec);
+    if (!ec && std::filesystem::is_directory(status) and not std::filesystem::is_symlink(status)) {
         for (const auto& entry: std::filesystem::directory_iterator(path, ec)) {
             removeAll(entry.path(), erase);
         }