Use inotify_init1 when available

To avoid leaking the inotify fd. Fixes bug 585478.

diff --git a/configure.in b/configure.in
index 2275962ed8572b6092312678aec3df8051fc11ba..540fbd66821630cf900cc8f48cc2244a012ad269 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1599,6 +1599,7 @@ inotify_support=no
 AC_CHECK_HEADERS([sys/inotify.h],
 [
        inotify_support=yes
+       AC_CHECK_FUNCS(inotify_init1)
 ])
 
 AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"])

diff --git a/gio/inotify/inotify-kernel.c b/gio/inotify/inotify-kernel.c
index f9861a0bdb71637174c421c31c8387566f5a720b..b0b85ae4b818057adb7fcbfe921312a4f60afb93 100644 (file)
--- a/gio/inotify/inotify-kernel.c
+++ b/gio/inotify/inotify-kernel.c
@@ -187,10 +187,15 @@ gboolean _ik_startup (void (*cb)(ik_event_t *event))
   /* Ignore multi-calls */
   if (initialized) 
     return inotify_instance_fd >= 0;
-  
+
   initialized = TRUE;
+
+#ifdef HAVE_INOTIFY_INIT1
+  inotify_instance_fd = inotify_init1 (IN_CLOEXEC);
+#else
   inotify_instance_fd = inotify_init ();
-  
+#endif
+
   if (inotify_instance_fd < 0)
     return FALSE;