From 89d525e41775086146234cb35669626ab222eccc Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 20 Apr 2013 13:07:50 -0700 Subject: Shared: Fixed readDefaultDataFile so it works on Windows. --- src/Text/Pandoc/Shared.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs index 001af6c6d..f8c776e27 100644 --- a/src/Text/Pandoc/Shared.hs +++ b/src/Text/Pandoc/Shared.hs @@ -105,7 +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 ) +import System.FilePath ( joinPath, splitDirectories ) #else import Paths_pandoc (getDataFileName) #endif @@ -526,7 +526,7 @@ readDefaultDataFile fname = Nothing -> ioError $ userError $ "Data file `" ++ fname ++ "' does not exist" Just contents -> return contents - where makeCanonical = joinPath . transformPathParts . splitBy (=='/') + where makeCanonical = joinPath . transformPathParts . splitDirectories transformPathParts = reverse . foldl go [] go as "." = as go (_:as) ".." = as -- cgit v1.2.3