msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

use cannonicalizePath in getFilePathMsg. This returns an absolute path and removes the .. indirection

Browse Source
This commit is contained in:
krasimir
2008-04-25 15:53:02 +00:00
parent d4832b4eeb
commit 0b47519d44
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/GF/Devel/UseIO.hs
View File

@@ -104,8 +104,10 @@ getFilePathMsg msg paths file = get paths where
get (p:ps) = do get (p:ps) = do
let pfile = p </> file let pfile = p </> file
exist <- doesFileExist pfile exist <- doesFileExist pfile
if exist then return (Just pfile) else get ps if not exist
--- catch (readFileStrict pfile >> return (Just pfile)) (\_ -> get ps) then get ps
else do pfile <- canonicalizePath pfile
return (Just pfile)
readFileIfPath :: [FilePath] -> String -> IOE (FilePath,BS.ByteString) readFileIfPath :: [FilePath] -> String -> IOE (FilePath,BS.ByteString)
readFileIfPath paths file = do readFileIfPath paths file = do