hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #778, findFileInParentsP: check dir perms before reading

Browse Source
This commit is contained in:
Daniel Gröber 2016-09-16 01:29:31 +02:00
parent 4bea7d5a85
commit 5b77feb4e3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Language/Haskell/GhcMod/PathsAndFiles.hs
View File

@ -130,10 +130,15 @@ findFileInParentsP p dir' = U.makeAbsolute' dir' >>= \dir ->
-- | @getFilesP p dir@. Find all __files__ satisfying @p@ in @.cabal@ in @dir@. -- | @getFilesP p dir@. Find all __files__ satisfying @p@ in @.cabal@ in @dir@.
getFilesP :: (FilePath -> Bool) -> DirPath -> IO [FileName] getFilesP :: (FilePath -> Bool) -> DirPath -> IO [FileName]
getFilesP p dir = filterM p' =<< getDirectoryContents dir getFilesP p dir = filterM p' =<< getDirectoryContentsSafe
where where
p' fn = do p' fn = do
(p fn && ) <$> doesFileExist (dir </> fn) (p fn && ) <$> doesFileExist (dir </> fn)
getDirectoryContentsSafe = do
rdable <- readable <$> getPermissions dir
if rdable
then getDirectoryContents dir
else return []
findCabalSandboxDir :: FilePath -> IO (Maybe FilePath) findCabalSandboxDir :: FilePath -> IO (Maybe FilePath)
findCabalSandboxDir dir = do findCabalSandboxDir dir = do