OrcLib: SystemDetails: use fs::path with GetCurrentWorkingDirectory

DFIR-ORC · Nov 9, 2020 · 60cb64d · 60cb64d
1 parent 769d7b2
commit 60cb64d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/OrcLib/SystemDetails.cpp b/src/OrcLib/SystemDetails.cpp
@@ -1695,7 +1695,7 @@ HRESULT SystemDetails::LoadSystemDetails()
     return S_OK;
 }
 
-HRESULT SystemDetails::GetCurrentWorkingDirectory(std::wstring& strCWD)
+HRESULT SystemDetails::GetCurrentWorkingDirectory(std::filesystem::path& cwd)
 {
     WCHAR path[MAX_PATH];
     DWORD retval = 0L;
@@ -1705,17 +1705,17 @@ HRESULT SystemDetails::GetCurrentWorkingDirectory(std::wstring& strCWD)
     }
     if (retval > MAX_PATH)
     {
-        CBinaryBuffer buffer;
-        buffer.SetCount(retval);
-        if (!(retval = GetCurrentDirectory(retval, buffer.GetP<WCHAR>())))
+        Buffer<WCHAR> buffer;
+        buffer.resize(retval);
+        if (!(retval = GetCurrentDirectory(retval, buffer.get())))
         {
             return HRESULT_FROM_WIN32(GetLastError());
         }
-        strCWD.assign(buffer.GetP<WCHAR>(), retval);
+        cwd = std::filesystem::path(std::wstring_view(buffer.get(), retval)).lexically_normal();
     }
     else
     {
-        strCWD.assign(path, retval);
+        cwd = std::filesystem::path(std::wstring_view(path, retval)).lexically_normal();
     }
     return S_OK;
 }

diff --git a/src/OrcLib/SystemDetails.h b/src/OrcLib/SystemDetails.h
@@ -107,7 +107,7 @@ class ORCLIB_API SystemDetails
     static HRESULT GetSystemLanguage(std::wstring& strLocale);
     static HRESULT GetUserLanguage(std::wstring& strLocale);
 
-    static HRESULT GetCurrentWorkingDirectory(std::wstring& strCMD);
+    static HRESULT GetCurrentWorkingDirectory(std::filesystem::path& cwd);
 
     static HRESULT GetProcessBinary(std::wstring& strFullPath);