Replace std::filesystem throwing functions with std::error_code match

DFIR-ORC · Feb 10, 2021 · 965ca2f · 965ca2f
1 parent 3c625eb
commit 965ca2f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 23 deletions.
diff --git a/src/OrcCommand/Command/WolfLauncher/WolfLauncher_Run.cpp b/src/OrcCommand/Command/WolfLauncher/WolfLauncher_Run.cpp
@@ -573,7 +573,8 @@ HRESULT Orc::Command::Wolf::Main::CreateAndUploadOutline()
             outlineSize());
     }
 
-    if (std::filesystem::exists(config.Outline.Path))
+    std::error_code ec;
+    if (std::filesystem::exists(config.Outline.Path, ec))
     {
         if (auto hr = UploadSingleFile(config.Outline.FileName, config.Outline.Path); FAILED(hr))
         {

diff --git a/src/OrcLib/ArchiveExtract.cpp b/src/OrcLib/ArchiveExtract.cpp
@@ -180,14 +180,11 @@ STDMETHODIMP ArchiveExtract::Extract(
         }
         fs::path absolute(szDirectory);
 
-        try
+        std::error_code ec;
+        fs::create_directories(absolute, ec);
+        if (ec)
         {
-            fs::create_directories(absolute);
-        }
-        catch (const fs::filesystem_error& error)
-        {
-            const auto [hr, msg] = AnsiToWide(error.what());
-            Log::Error(L"Failed to create directory '{}' while processing file '{}': {}", absolute, item.Path, msg);
+            Log::Error(L"Failed to create directory '{}' while processing file '{}' [{}]", absolute, item.Path, ec);
             return nullptr;
         }
 
@@ -297,13 +294,11 @@ STDMETHODIMP ArchiveExtract::Extract(
         }
         fs::path absolute(szDirectory);
 
-        try
-        {
-            fs::create_directories(absolute);
-        }
-        catch (const fs::filesystem_error& error)
+        std::error_code ec;
+        fs::create_directories(absolute, ec);
+        if (ec)
         {
-            auto code = error.code();
+            Log::Error(L"Failed to create directory '{}' [{}]", absolute, ec);
             return nullptr;
         }
 
@@ -365,15 +360,14 @@ STDMETHODIMP ArchiveExtract::Extract(
         }
         fs::path absolute(szDirectory);
 
-        try
+        std::error_code ec;
+        fs::create_directories(absolute, ec);
+        if (ec)
         {
-            fs::create_directories(absolute);
-        }
-        catch (const fs::filesystem_error& exception)
-        {
-            auto code = exception.code();
+            Log::Error(L"Failed to create directory '{}' [{}]", absolute, ec);
             return nullptr;
         }
+
         auto filestream = make_shared<FileStream>();
         if (FAILED(hr = filestream->OpenHandle(hFile)))
             return nullptr;

diff --git a/src/OrcLib/EmbeddedResource_Extract.cpp b/src/OrcLib/EmbeddedResource_Extract.cpp
@@ -1110,7 +1110,13 @@ HRESULT EmbeddedResource::ExpandArchivesAndBinaries(const std::wstring& outDir,
 
         wstring out = outDir + L"\\" + item.Name;
 
-        fs::create_directories(fs::path(out));
+        std::error_code ec;
+        fs::create_directories(fs::path(out), ec);
+        if (ec)
+        {
+            Log::Error(L"Failed to create directory '{}' [{}]", out, ec);
+            continue;
+        }
 
         if (FAILED(hr = extractor->Extract(archStream, out.c_str(), nullptr)))
         {

diff --git a/src/OrcLib/ExtensionLibrary.cpp b/src/OrcLib/ExtensionLibrary.cpp
@@ -396,7 +396,9 @@ STDMETHODIMP ExtensionLibrary::Cleanup()
         if (auto hr = UtilDeleteTemporaryFile(m_libFile); FAILED(hr))
             return hr;
     }
-    if (m_bDeleteTemp && !m_tempDir.empty() && std::filesystem::exists(m_tempDir))
+
+    std::error_code ec;
+    if (m_bDeleteTemp && !m_tempDir.empty() && std::filesystem::exists(m_tempDir, ec))
     {
         if (auto hr = UtilDeleteTemporaryDirectory(m_tempDir); FAILED(hr))
             return hr;

diff --git a/src/OrcLib/Log/Sink/FileSink.h b/src/OrcLib/Log/Sink/FileSink.h
@@ -53,7 +53,12 @@ class FileSink final : public spdlog::sinks::base_sink<Mutex>
             return;
         }
 
-        std::filesystem::remove(path);
+        std::filesystem::remove(path, ec);
+        if (ec)
+        {
+            Log::Debug(L"Failed to remove '{}' [{}]", path, ec);
+            ec.clear();
+        }
 
         // Dump memorySink if any
         if (m_memorySink)