diff options
Diffstat (limited to 'Utility/DirWatcher')
-rw-r--r-- | Utility/DirWatcher/FSEvents.hs | 4 | ||||
-rw-r--r-- | Utility/DirWatcher/Win32Notify.hs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Utility/DirWatcher/FSEvents.hs b/Utility/DirWatcher/FSEvents.hs index 18c73ec57..db6ac0434 100644 --- a/Utility/DirWatcher/FSEvents.hs +++ b/Utility/DirWatcher/FSEvents.hs @@ -67,7 +67,9 @@ watchDir dir ignored hooks = do | otherwise = noop scan d = unless (ignoredPath ignored d) $ - mapM_ go =<< dirContentsRecursive d + -- Do not follow symlinks when scanning. + -- This mirrors the inotify startup scan behavior. + mapM_ go =<< dirContentsRecursiveSkipping (const False) False d where go f | ignoredPath ignored f = noop diff --git a/Utility/DirWatcher/Win32Notify.hs b/Utility/DirWatcher/Win32Notify.hs index 74b36b4f1..27175e1c8 100644 --- a/Utility/DirWatcher/Win32Notify.hs +++ b/Utility/DirWatcher/Win32Notify.hs @@ -42,7 +42,7 @@ watchDir dir ignored hooks = do runhook h s = maybe noop (\a -> a (filePath evt) s) (h hooks) scan d = unless (ignoredPath ignored d) $ - mapM_ go =<< dirContentsRecursive d + mapM_ go =<< dirContentsRecursiveSkipping (const False) False d where go f | ignoredPath ignored f = noop |