diff options
| author | krasimir <krasimir@chalmers.se> | 2008-04-25 15:53:02 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2008-04-25 15:53:02 +0000 |
| commit | 0b47519d4427a451f4c7d9d1f24ef53b6d36f80d (patch) | |
| tree | fe757d5070662b0e3680f10a46b356e5d8d88cc5 /src/GF | |
| parent | d4832b4eeb192b10f096366d1bd3e8ea35a51413 (diff) | |
use cannonicalizePath in getFilePathMsg. This returns an absolute path and removes the .. indirection
Diffstat (limited to 'src/GF')
| -rw-r--r-- | src/GF/Devel/UseIO.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/GF/Devel/UseIO.hs b/src/GF/Devel/UseIO.hs index 3311edb8c..39b8447f7 100644 --- a/src/GF/Devel/UseIO.hs +++ b/src/GF/Devel/UseIO.hs @@ -104,8 +104,10 @@ getFilePathMsg msg paths file = get paths where get (p:ps) = do let pfile = p </> file exist <- doesFileExist pfile - if exist then return (Just pfile) else get ps ---- catch (readFileStrict pfile >> return (Just pfile)) (\_ -> get ps) + if not exist + then get ps + else do pfile <- canonicalizePath pfile + return (Just pfile) readFileIfPath :: [FilePath] -> String -> IOE (FilePath,BS.ByteString) readFileIfPath paths file = do |
