enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Readd watch if a file is recreated. 

SVN revision: 29197
This commit is contained in:
Sebastian Dransfeld 2007-03-27 05:36:29 +00:00
parent 156a9bcf0f
commit 0f6383ee5b
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c
View File

@ -31,8 +31,8 @@ static Ecore_List2 *_monitors = NULL;
static int _ecore_file_monitor_inotify_handler(void *data, Ecore_Fd_Handler *fdh);
static Ecore_File_Monitor *_ecore_file_monitor_inotify_monitor_find(int wd);
static void _ecore_file_monitor_inotify_events(Ecore_File_Monitor *em,
char *file, int mask);
static void _ecore_file_monitor_inotify_events(Ecore_File_Monitor *em, char *file, int mask);
static int _ecore_file_monitor_inotify_monitor(Ecore_File_Monitor *em, const char *path);
#if 0
static void _ecore_file_monitor_inotify_print(char *file, int mask);
#endif
@ -104,16 +104,7 @@ ecore_file_monitor_inotify_add(const char *path,
if (ecore_file_exists(em->path))
{
int mask;
mask = IN_MODIFY|
IN_MOVED_FROM|IN_MOVED_TO|
IN_DELETE|IN_CREATE|
IN_DELETE_SELF|IN_MOVE_SELF|
IN_UNMOUNT;
ECORE_FILE_MONITOR_INOTIFY(em)->wd = inotify_add_watch(ecore_main_fd_handler_fd_get(_fdh),
em->path,
mask);
if (ECORE_FILE_MONITOR_INOTIFY(em)->wd < 0)
if (!_ecore_file_monitor_inotify_monitor(em, em->path))
{
printf("inotify_add_watch error\n");
ecore_file_monitor_inotify_del(em);
@ -251,6 +242,38 @@ _ecore_file_monitor_inotify_events(Ecore_File_Monitor *em, char *file, int mask)
/* We just call delete. The dir is gone... */
em->func(em->data, em, ECORE_FILE_EVENT_DELETED_SELF, em->path);
}
if (mask & IN_IGNORED)
{
/* The watch is removed. If the file name still exists monitor the new one,
* else delete it */
if (ecore_file_exists(em->path))
{
if (!_ecore_file_monitor_inotify_monitor(em, em->path))
em->func(em->data, em, ECORE_FILE_EVENT_DELETED_SELF, em->path);
}
else
em->func(em->data, em, ECORE_FILE_EVENT_DELETED_SELF, em->path);
}
}
static int
_ecore_file_monitor_inotify_monitor(Ecore_File_Monitor *em, const char *path)
{
int mask;
mask = IN_MODIFY|
IN_MOVED_FROM|IN_MOVED_TO|
IN_DELETE|IN_CREATE|
IN_DELETE_SELF|IN_MOVE_SELF|
IN_UNMOUNT;
ECORE_FILE_MONITOR_INOTIFY(em)->wd = inotify_add_watch(ecore_main_fd_handler_fd_get(_fdh),
path, mask);
if (ECORE_FILE_MONITOR_INOTIFY(em)->wd < 0)
{
printf("inotify_add_watch error\n");
ecore_file_monitor_inotify_del(em);
return 0;
}
return 1;
}
#if 0