summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Poole <mail@alastairpoole.com>2021-11-25 19:20:49 +0000
committerAlastair Poole <mail@alastairpoole.com>2021-11-25 19:20:49 +0000
commit43108e772a95d98fdd48f43a4fe707d7995e18b2 (patch)
treefc29e1f3f273f2c0a4d92f540e69ab7a7b2039b8
parent9ba7c3667ca4875e482b542be363aafd5ddc8088 (diff)
downloadefl-43108e772a95d98fdd48f43a4fe707d7995e18b2.tar.gz
ecore_file: Monitor file writes (kevent).
Trigger ECORE_FILE_EVENT_MODIFIED on file write. @fix
-rw-r--r--src/lib/ecore_file/ecore_file_monitor_kevent.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/ecore_file/ecore_file_monitor_kevent.c b/src/lib/ecore_file/ecore_file_monitor_kevent.c
index e8c4c1e238..9c5ad66c4e 100644
--- a/src/lib/ecore_file/ecore_file_monitor_kevent.c
+++ b/src/lib/ecore_file/ecore_file_monitor_kevent.c
@@ -121,7 +121,6 @@ _ecore_file_monitor_kevent_ls(const char *directory)
it = eina_file_direct_ls(directory);
if (!it) return NULL;
-
EINA_ITERATOR_FOREACH(it, info)
{
File_Info *file = malloc(sizeof(File_Info));
@@ -191,7 +190,10 @@ _ecore_file_monitor_kevent_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fdh
}
if ((evs[i].fflags & NOTE_WRITE) || (evs[i].fflags & NOTE_ATTRIB))
{
- _ecore_file_monitor_kevent_find(em);
+ if (ecore_file_is_dir(em->path))
+ _ecore_file_monitor_kevent_find(em);
+ else
+ em->func(em->data, em, ECORE_FILE_EVENT_MODIFIED, em->path);
}
}
@@ -206,7 +208,6 @@ _ecore_file_monitor_kevent_find(Ecore_File_Monitor *em)
Eina_List *files;
files = _ecore_file_monitor_kevent_ls(em->path);
-
EINA_LIST_FOREACH(ECORE_FILE_MONITOR_KEVENT(em)->prev, l, file)
{
Eina_Bool exists = EINA_FALSE;
@@ -262,7 +263,7 @@ _ecore_file_monitor_kevent_monitor(Ecore_File_Monitor *em, const char *path)
struct kevent ev;
int fd, res = 0;
- if ((!ecore_file_exists(path)) || (!ecore_file_is_dir(path)))
+ if (!ecore_file_exists(path))
return 0;
fd = open(path, O_RDONLY);
@@ -276,7 +277,8 @@ _ecore_file_monitor_kevent_monitor(Ecore_File_Monitor *em, const char *path)
eina_file_close_on_exec(fd, EINA_TRUE);
ECORE_FILE_MONITOR_KEVENT(em)->fd = fd;
- ECORE_FILE_MONITOR_KEVENT(em)->prev = _ecore_file_monitor_kevent_ls(em->path);
+ if (ecore_file_is_dir(em->path))
+ ECORE_FILE_MONITOR_KEVENT(em)->prev = _ecore_file_monitor_kevent_ls(em->path);
eina_hash_direct_add(_kevent_monitors, &(ECORE_FILE_MONITOR_KEVENT(em)->fd), em);