commit 4c521c3c34162b6a5930ac1d78da3456f9b69283
author Ed Tanous <ed@tanous.net> Sun Apr 07 13:47:06 2024 -0700
committer Ed Tanous <ed@tanous.net> Thu Apr 11 18:21:53 2024 +0000
tree 9341d14061a4dd9a21d41a528a66d45c78687b74
parent 8c3faccc941d5b32722554f8f24f320fd02dd4ab

Fix file removal

This code used std::remove, which is a mechanism for removing characters
from strings.  Clearly it meant std::filesystem::remove(), which removes
files from the filesystem.

Correct it.

Change-Id: I030966203c1682a11c723c596accdf34637dd1ba
Signed-off-by: Ed Tanous <ed@tanous.net>

include/hostname_monitor.hpp

diff --git a/include/hostname_monitor.hpp b/include/hostname_monitor.hpp
index 6339a6b..188deff 100644
--- a/include/hostname_monitor.hpp
+++ b/include/hostname_monitor.hpp
@@ -28,7 +28,12 @@
 
         BMCWEB_LOG_INFO("Replace HTTPs Certificate Success, "
                         "remove temporary certificate file..");
-        remove(certPath.c_str());
+        std::error_code ec2;
+        std::filesystem::remove(certPath.c_str(), ec2);
+        if (ec2)
+        {
+            BMCWEB_LOG_ERROR("Failed to remove certificate");
+        }
     },
         "xyz.openbmc_project.Certs.Manager.Server.Https",
         "/xyz/openbmc_project/certs/server/https/1",

include/nbd_proxy.hpp

diff --git a/include/nbd_proxy.hpp b/include/nbd_proxy.hpp
index 838e7a1..9607ddf 100644
--- a/include/nbd_proxy.hpp
+++ b/include/nbd_proxy.hpp
@@ -63,8 +63,13 @@
         boost::system::error_code ec;
         peerSocket.close(ec);
 
-        BMCWEB_LOG_DEBUG("std::remove({})", socketId);
-        std::remove(socketId.c_str());
+        BMCWEB_LOG_DEBUG("std::filesystem::remove({})", socketId);
+        std::error_code ec2;
+        std::filesystem::remove(socketId.c_str(), ec2);
+        if (ec2)
+        {
+            BMCWEB_LOG_DEBUG("Failed to remove file, ignoring");
+        }
 
         crow::connections::systemBus->async_method_call(
             dbus::utility::logError, "xyz.openbmc_project.VirtualMedia", path,

redfish-core/include/event_service_manager.hpp

diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp
index 9872bf8..0c12cd3 100644
--- a/redfish-core/include/event_service_manager.hpp
+++ b/redfish-core/include/event_service_manager.hpp
@@ -766,8 +766,17 @@
             }
 
             persistent_data::getConfig().writeData();
-            std::remove(eventServiceFile);
-            BMCWEB_LOG_DEBUG("Remove old eventservice config");
+            std::error_code ec;
+            std::filesystem::remove(eventServiceFile, ec);
+            if (ec)
+            {
+                BMCWEB_LOG_DEBUG(
+                    "Failed to remove old event service file.  Ignoring");
+            }
+            else
+            {
+                BMCWEB_LOG_DEBUG("Remove old eventservice config");
+            }
         }
     }