projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always remove, invalidate and free watches before closing watched sockets
[platform/upstream/dbus.git]
/
bus
/
dir-watch-kqueue.c
diff --git
a/bus/dir-watch-kqueue.c
b/bus/dir-watch-kqueue.c
index
e7b0e2c
..
62f7b3d
100644
(file)
--- a/
bus/dir-watch-kqueue.c
+++ b/
bus/dir-watch-kqueue.c
@@
-81,6
+81,7
@@
_handle_kqueue_watch (DBusWatch *watch, unsigned int flags, void *data)
if (watch != NULL)
{
_dbus_loop_remove_watch (loop, watch, _kqueue_watch_callback, NULL);
if (watch != NULL)
{
_dbus_loop_remove_watch (loop, watch, _kqueue_watch_callback, NULL);
+ _dbus_watch_invalidate (watch);
_dbus_watch_unref (watch);
watch = NULL;
}
_dbus_watch_unref (watch);
watch = NULL;
}
@@
-124,10
+125,11
@@
_init_kqueue (BusContext *context)
NULL, NULL))
{
_dbus_warn ("Unable to add reload watch to main loop");
NULL, NULL))
{
_dbus_warn ("Unable to add reload watch to main loop");
- close (kq);
- kq = -1;
+ _dbus_watch_invalidate (watch);
_dbus_watch_unref (watch);
watch = NULL;
_dbus_watch_unref (watch);
watch = NULL;
+ close (kq);
+ kq = -1;
goto out;
}
}
goto out;
}
}
@@
-169,7
+171,7
@@
bus_set_watched_dirs (BusContext *context, DBusList **directories)
*/
for (i = 0; new_dirs[i]; i++)
{
*/
for (i = 0; new_dirs[i]; i++)
{
- for (j = 0;
i
< num_fds; j++)
+ for (j = 0;
j
< num_fds; j++)
{
if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0)
{
{
if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0)
{
@@
-204,11
+206,20
@@
bus_set_watched_dirs (BusContext *context, DBusList **directories)
* we may need to sleep.
*/
fd = open (new_dirs[i], O_RDONLY);
* we may need to sleep.
*/
fd = open (new_dirs[i], O_RDONLY);
- if (fd < 0)
+
if (fd < 0)
{
{
- _dbus_warn ("Cannot open directory '%s'; error '%s'\n", new_dirs[i], _dbus_strerror (errno));
- goto out;
- }
+ if (errno != ENOENT)
+ {
+ _dbus_warn ("Cannot open directory '%s'; error '%s'\n", new_dirs[i], _dbus_strerror (errno));
+ goto out;
+ }
+ else
+ {
+ new_fds[i] = -1;
+ new_dirs[i] = NULL;
+ continue;
+ }
+ }
EV_SET (&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0);
EV_SET (&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0);