diff options
| author | Chengwei Yang <chengwei.yang@intel.com> | 2013-12-02 12:47:47 +0800 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-06 16:04:44 +0000 |
| commit | f4618906b0dce251cdc3125b60239f7dd0df7183 (patch) | |
| tree | 9edddbd883648e47c59292686048fef75d74d043 | |
| parent | 854554c3a67b880ac92fa72c476b772cb5968b26 (diff) | |
| download | dbus-f4618906b0dce251cdc3125b60239f7dd0df7183.tar.gz | |
kqueue: open watched directories with close-on-exec flag
[FreeBSD and OpenBSD contributors clarified that O_CLOEXEC has been
supported for ~ 2 years on both, so for the moment we're assuming
that every platform with kqueue also has working O_CLOEXEC. Please reopen
the bug, with a tested patch that uses _dbus_fd_set_close_on_exec() instead,
if this assumption turns out to be false. -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72213
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | bus/dir-watch-kqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c index 4cc780de..33d5e95d 100644 --- a/bus/dir-watch-kqueue.c +++ b/bus/dir-watch-kqueue.c @@ -259,7 +259,7 @@ bus_set_watched_dirs (BusContext *context, DBusList **directories) /* FIXME - less lame error handling for failing to add a watch; * we may need to sleep. */ - fd = open (new_dirs[i], O_RDONLY); + fd = open (new_dirs[i], O_RDONLY | O_CLOEXEC); if (fd < 0) { if (errno != ENOENT) |