Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert "Improved previous patch so it really solves the Windows issue."

Browse source 
This reverts commit e80116c813.
This commit is contained in:
John MacFarlane 2013-04-20 10:09:17 -07:00
parent e80116c813
commit 3c1a8d1924
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Text/Pandoc/Shared.hs
View file

@ -105,6 +105,7 @@ import Network.HTTP (findHeader, rspBody,
import Network.Browser (browse, setAllowRedirects, request) import Network.Browser (browse, setAllowRedirects, request)
#ifdef EMBED_DATA_FILES #ifdef EMBED_DATA_FILES
import Text.Pandoc.Data (dataFiles) import Text.Pandoc.Data (dataFiles)
import System.FilePath ( joinPath )
#else #else
import Paths_pandoc (getDataFileName) import Paths_pandoc (getDataFileName)
#endif #endif
@ -525,7 +526,7 @@ readDefaultDataFile fname =
Nothing -> ioError $ userError Nothing -> ioError $ userError
$ "Data file `" ++ fname ++ "' does not exist" $ "Data file `" ++ fname ++ "' does not exist"
Just contents -> return contents Just contents -> return contents
where makeCanonical = intercalate "/" . transformPathParts . splitBy (=='/') where makeCanonical = joinPath . transformPathParts . splitBy (=='/')
transformPathParts = reverse . foldl go [] transformPathParts = reverse . foldl go []
go as "." = as go as "." = as
go (_:as) ".." = as go (_:as) ".." = as