Skip to content

Commit

Permalink
Revert "Improved previous patch so it really solves the Windows issue."
Browse files Browse the repository at this point in the history
This reverts commit e80116c.
  • Loading branch information
jgm committed Apr 20, 2013
1 parent e80116c commit 3c1a8d1
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/Text/Pandoc/Shared.hs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ import Network.HTTP (findHeader, rspBody,
import Network.Browser (browse, setAllowRedirects, request)
#ifdef EMBED_DATA_FILES
import Text.Pandoc.Data (dataFiles)
import System.FilePath ( joinPath )
#else
import Paths_pandoc (getDataFileName)
#endif
Expand Down Expand Up @@ -525,7 +526,7 @@ readDefaultDataFile fname =
Nothing -> ioError $ userError
$ "Data file `" ++ fname ++ "' does not exist"
Just contents -> return contents
where makeCanonical = intercalate "/" . transformPathParts . splitBy (=='/')
where makeCanonical = joinPath . transformPathParts . splitBy (=='/')
transformPathParts = reverse . foldl go []
go as "." = as
go (_:as) ".." = as
Expand Down

0 comments on commit 3c1a8d1

Please sign in to comment.