From f4618906b0dce251cdc3125b60239f7dd0df7183 Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Mon, 2 Dec 2013 12:47:47 +0800 Subject: [PATCH] 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 --- bus/dir-watch-kqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c index 4cc780dec..33d5e95df 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) -- 2.47.3