diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-06 18:29:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 18:55:56 -0400 |
| commit | 2bba5bc22d049272d3328bfa6c452d3e2e50e86c (patch) | |
| tree | 19feab50e43dc330038224ea98b371916ca02133 /CmdLine/Seek.hs | |
| parent | 014e909a449d0822eff4962a504d6a524abe8fc7 (diff) | |
made parentDir return a Maybe FilePath; removed most uses of it
parentDir is less safe than takeDirectory, especially when working
with relative FilePaths. It's really only useful in loops that
want to terminate at /
This commit was sponsored by Audric SCHILTKNECHT.
Diffstat (limited to 'CmdLine/Seek.hs')
| -rw-r--r-- | CmdLine/Seek.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CmdLine/Seek.hs b/CmdLine/Seek.hs index 9a874807b..b35e39ba0 100644 --- a/CmdLine/Seek.hs +++ b/CmdLine/Seek.hs @@ -70,7 +70,7 @@ withPathContents a params = seekActions $ map a . concat <$> liftIO (mapM get params) where get p = ifM (isDirectory <$> getFileStatus p) - ( map (\f -> (f, makeRelative (parentDir p) f)) + ( map (\f -> (f, makeRelative (takeDirectory p) f)) <$> dirContentsRecursiveSkipping (".git" `isSuffixOf`) True p , return [(p, takeFileName p)] ) |