Resolve paths while parsing them from the command line.

The current directory is a process wide setting that can potentially be changed by any thread.
Remove fileutil methods that had equivalent pathutil methods.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/cabutil.cpp b/src/libs/dutil/WixToolset.DUtil/cabutil.cpp
index 5d77e483..f3629d57 100644
--- a/src/libs/dutil/WixToolset.DUtil/cabutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/cabutil.cpp
@@ -106,7 +106,7 @@ static HANDLE OpenFileWithRetry(
     __in LPCWSTR wzPath,
     __in DWORD dwDesiredAccess,
     __in DWORD dwCreationDisposition
-)
+    )
 {
     HANDLE hFile = INVALID_HANDLE_VALUE;
 
@@ -286,7 +286,7 @@ static HRESULT DAPI CabOperation(
     //
     // split the cabinet full path into directory and filename and convert to multi-byte (ick!)
     //
-    pwz = FileFromPath(sczCabinet);
+    pwz = PathFile(sczCabinet);
     CabExitOnNull(pwz, hr, E_INVALIDARG, "failed to process cabinet path: %ls", wzCabinet);
 
     if (!::WideCharToMultiByte(CP_UTF8, 0, pwz, -1, szCabFile, countof(szCabFile), NULL, NULL))