diff options
| author | Max Kellermann <max@duempel.org> | 2009-11-07 18:55:16 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-11-07 18:55:16 +0100 |
| commit | e3af0032b236dc52d4a74c4d740e57a1f6d520aa (patch) | |
| tree | 3984233a9b639e71ad80b4f6598539de3a27a008 /src/output/mvp_plugin.c | |
| parent | 9b21152600071ec46c021c8ba3b2ef69c90f039f (diff) | |
| download | mpd-e3af0032b236dc52d4a74c4d740e57a1f6d520aa.tar.gz mpd-e3af0032b236dc52d4a74c4d740e57a1f6d520aa.tar.xz mpd-e3af0032b236dc52d4a74c4d740e57a1f6d520aa.zip | |
set the close-on-exec flag on all file descriptors
Added the "fd_util" library, which attempts to use the new thread-safe
Linux system calls pipe2(), accept4() and the options O_CLOEXEC,
SOCK_CLOEXEC. Without these, it falls back to FD_CLOEXEC, which is
not thread safe.
This is particularly important for the "pipe" output plugin (and
others, such as JACK/PulseAudio), because we were heavily leaking file
descriptors to child processes.
Diffstat (limited to 'src/output/mvp_plugin.c')
| -rw-r--r-- | src/output/mvp_plugin.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/output/mvp_plugin.c b/src/output/mvp_plugin.c index 96f9435a8..f5fbadbee 100644 --- a/src/output/mvp_plugin.c +++ b/src/output/mvp_plugin.c @@ -22,7 +22,8 @@ * http://mvpmc.sourceforge.net/ */ -#include "../output_api.h" +#include "output_api.h" +#include "fd_util.h" #include <glib.h> @@ -115,7 +116,7 @@ mvp_output_test_default_device(void) { int fd; - fd = open("/dev/adec_pcm", O_WRONLY); + fd = open_cloexec("/dev/adec_pcm", O_WRONLY); if (fd >= 0) { close(fd); @@ -230,7 +231,8 @@ mvp_output_open(void *data, struct audio_format *audio_format, GError **error) int mix[5] = { 0, 2, 7, 1, 0 }; bool success; - if ((md->fd = open("/dev/adec_pcm", O_RDWR | O_NONBLOCK)) < 0) { + md->fd = open_cloexec("/dev/adec_pcm", O_RDWR | O_NONBLOCK); + if (md->fd < 0) { g_set_error(error, mvp_output_quark(), errno, "Error opening /dev/adec_pcm: %s", strerror(errno)); |