Revert "work around absNormPath not working on Windows"
This reverts commit 0fc3ad82c5
.
That caused 2 other test cases to fail. Windows path slash issues are
horrible.
This commit is contained in:
parent
0fc3ad82c5
commit
28cabd9909
3 changed files with 5 additions and 16 deletions
|
@ -21,10 +21,10 @@ import Control.Applicative
|
|||
import Data.Char
|
||||
import qualified System.FilePath.Posix as Posix
|
||||
#else
|
||||
import qualified "MissingH" System.Path as MissingH
|
||||
import System.Posix.Files
|
||||
#endif
|
||||
|
||||
import qualified "MissingH" System.Path as MissingH
|
||||
import Utility.Monad
|
||||
import Utility.UserInfo
|
||||
|
||||
|
@ -34,15 +34,15 @@ import Utility.UserInfo
|
|||
-
|
||||
- On Unix, collapses and normalizes ".." etc in the path. May return Nothing
|
||||
- if the path cannot be normalized.
|
||||
-
|
||||
- MissingH's absNormPath does not work on Windows, so on Windows
|
||||
- no normalization is done.
|
||||
-}
|
||||
absNormPath :: FilePath -> FilePath -> Maybe FilePath
|
||||
#ifndef mingw32_HOST_OS
|
||||
absNormPath dir path = MissingH.absNormPath dir path
|
||||
#else
|
||||
absNormPath dir path = todos <$> MissingH.absNormPath (fromdos dir) (fromdos path)
|
||||
where
|
||||
fromdos = replace "\\" "/"
|
||||
todos = replace "/" "\\"
|
||||
absNormPath dir path = Just $ combine dir path
|
||||
#endif
|
||||
|
||||
{- Returns the parent directory of a path.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue