oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

inotify: set close-on-exec flag

Browse Source 
Added wrapper for inotify_init1() to fd_util.c.
This commit is contained in:
Max Kellermann 2009-11-07 19:02:53 +01:00
parent e3af0032b2
commit 1573ea1485
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/fd_util.c
View File

@ -35,6 +35,10 @@
#include <sys/socket.h>
#endif
#ifdef HAVE_INOTIFY_INIT
#include <sys/inotify.h>
#endif
#ifndef WIN32
static int
@ -169,3 +173,25 @@ accept_cloexec(int fd, struct sockaddr *address, size_t *address_length_r)
return ret;
}
#ifdef HAVE_INOTIFY_INIT
int
inotify_init_cloexec(void)
{
int fd;
#ifdef HAVE_INOTIFY_INIT1
fd = inotify_init1(IN_CLOEXEC);
if (fd >= 0 || errno != ENOSYS)
return fd;
#endif
fd = inotify_init();
if (fd >= 0)
fd_set_cloexec(fd, true);
return fd;
}
#endif

3
src/fd_util.h
View File

@ -50,4 +50,7 @@ socket_cloexec(int domain, int type, int protocol);
int
accept_cloexec(int fd, struct sockaddr *address, size_t *address_length_r);
int
inotify_init_cloexec(void);
#endif

3
src/inotify_source.c
View File

@ -19,6 +19,7 @@
#include "inotify_source.h"
#include "fifo_buffer.h"
#include "fd_util.h"
#include <sys/inotify.h>
#include <unistd.h>
@ -105,7 +106,7 @@ mpd_inotify_source_new(mpd_inotify_callback_t callback, void *callback_ctx,
struct mpd_inotify_source *source =
g_new(struct mpd_inotify_source, 1);
source->fd = inotify_init();
source->fd = inotify_init_cloexec();
if (source->fd < 0) {
g_set_error(error_r, mpd_inotify_quark(), errno,
"inotify_init() has failed: %s",