more OsPath conversion

Sponsored-by: Eve
This commit is contained in:
Joey Hess 2025-01-24 14:49:10 -04:00
parent dd01406018
commit aa0f3f31da
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
23 changed files with 155 additions and 166 deletions

View file

@ -13,9 +13,9 @@ module Utility.Path.Windows (
) where
import Utility.Path
import Utility.OsPath
import Utility.FileSystemEncoding
import System.FilePath.ByteString (combine)
import qualified Data.ByteString as B
import qualified System.FilePath.Windows.ByteString as P
import System.Directory (getCurrentDirectory)
@ -37,7 +37,7 @@ convertToWindowsNativeNamespace f
-- Make absolute because any '.' and '..' in the path
-- will not be resolved once it's converted.
cwd <- toRawFilePath <$> getCurrentDirectory
let p = simplifyPath (combine cwd f)
let p = fromOsPath (simplifyPath (toOsPath (combine cwd f)))
-- Normalize slashes.
let p' = P.normalise p
return (win32_file_namespace <> p')