diff options
author | root <root> | 2008-12-12 20:35:21 +0000 |
---|---|---|
committer | root <root> | 2008-12-12 20:35:21 +0000 |
commit | 596d7d3713224fd2bb1dca6f02288a7b2bbc1f2c (patch) | |
tree | c950b2bdf0c68c35291965615163f6baa4382786 /ev.c | |
parent | 73dc4a3e604cf3ffb01ff3436669a29b062e3585 (diff) |
infy fix
Diffstat (limited to 'ev.c')
-rw-r--r-- | ev.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -2480,8 +2480,8 @@ infy_add (EV_P_ ev_stat *w) char *pend = strrchr (path, '/'); - if (!pend) - break; /* whoops, no '/', complain to your admin */ + if (!pend || pend == path) + break; *pend = 0; w->wd = inotify_add_watch (fs_fd, path, mask); @@ -2489,7 +2489,8 @@ infy_add (EV_P_ ev_stat *w) while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); } } - else + + if (w->wd >= 0) { wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); @@ -2549,6 +2550,7 @@ infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) { if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) { + wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); w->wd = -1; infy_add (EV_A_ w); /* re-add, no matter what */ } |