Merge pull request #266 from Sunrisepeak/sunrisepeak-patch-fwatcher

bugfix: fwatcher: fix recursion detect issue for linux platform
tboox · Sep 22, 2024 · f815e56 · f815e56
2 parents 3231280 + 49e71d4
commit f815e56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/tbox/platform/bsd/fwatcher_kqueue.c b/src/tbox/platform/bsd/fwatcher_kqueue.c
@@ -304,8 +304,8 @@ tb_bool_t tb_fwatcher_add(tb_fwatcher_ref_t self, tb_char_t const* watchdir, tb_
         return tb_false;
 
     // is directory? we need scan it and add all subfiles
-    if (info.type == TB_FILE_TYPE_DIRECTORY)
-        tb_directory_walk(watchdir, recursion? -1 : 0, tb_true, tb_fwatcher_add_watch_filedirs, fwatcher);
+    if (info.type == TB_FILE_TYPE_DIRECTORY && recursion)
+        tb_directory_walk(watchdir, -1, tb_true, tb_fwatcher_add_watch_filedirs, fwatcher);
     return tb_fwatcher_add_watch(fwatcher, watchdir, recursion);
 }
 

diff --git a/src/tbox/platform/linux/fwatcher_inotify.c b/src/tbox/platform/linux/fwatcher_inotify.c
@@ -262,7 +262,7 @@ tb_bool_t tb_fwatcher_add(tb_fwatcher_ref_t self, tb_char_t const* watchdir, tb_
 
     // is directory? we need scan it and add all subdirs
     if (info.type == TB_FILE_TYPE_DIRECTORY && recursion)
-        tb_directory_walk(watchdir, 0, tb_true, tb_fwatcher_add_watch_dirs, fwatcher);
+        tb_directory_walk(watchdir, -1, tb_true, tb_fwatcher_add_watch_dirs, fwatcher);
     return tb_fwatcher_add_watch(fwatcher, watchdir, recursion);
 }