mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into ospath

Browse source
This commit is contained in:
Joey Hess 2025-01-29 15:37:19 -04:00
commit c309edb8fb
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Utility/OsPath.hs
View file

@ -86,7 +86,7 @@ bytesFromOsPath :: OsPath -> RawFilePath
-- On Windows, OsString contains a ShortByteString that is -- On Windows, OsString contains a ShortByteString that is
-- utf-16 encoded, but RawFilePath is utf-8. -- utf-16 encoded, but RawFilePath is utf-8.
-- So this is relatively expensive conversion. -- So this is relatively expensive conversion.
bytesFromOsPath = toRawFilePath . cWcharsToChars_UCS2 . BS16.unpack . getWindowsString bytesFromOsPath = toRawFilePath . cWcharsToChars_UCS2 . BS16.unpack . getWindowsString . getOsString
#else #else
bytesFromOsPath :: OsPath -> ShortByteString bytesFromOsPath :: OsPath -> ShortByteString
bytesFromOsPath = getPosixString . getOsString bytesFromOsPath = getPosixString . getOsString