summaryrefslogtreecommitdiffstats
path: root/stream/ai_oss.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-30 22:40:51 +0100
committerwm4 <wm4@nowhere>2013-11-30 22:40:51 +0100
commit95cfe58e3db9d939abe7a9a26116c1d576eed60b (patch)
tree98a4738f2f989c900702d84ef8a257f9413389af /stream/ai_oss.c
parenteea69682a6a874d540f9fc576c937466970713f6 (diff)
downloadmpv-95cfe58e3db9d939abe7a9a26116c1d576eed60b.tar.bz2
mpv-95cfe58e3db9d939abe7a9a26116c1d576eed60b.tar.xz
Use O_CLOEXEC when creating FDs
This is needed so that new processes (created with fork+exec) don't inherit open files, which can be important for a number of reasons. Since O_CLOEXEC is relatively new (POSIX.1-2008, before that Linux specific), we #define it to 0 in io.h to prevent compilation errors on older/crappy systems. At least this is the plan. input.c creates a pipe. For that, add a mp_set_cloexec() function (which is based on Weston's code in vo_wayland.c, but more correct). We could use pipe2() instead, but that is Linux specific. Technically, we have a race condition, but it won't matter.
Diffstat (limited to 'stream/ai_oss.c')
-rw-r--r--stream/ai_oss.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/stream/ai_oss.c b/stream/ai_oss.c
index 46e232b264..d222490430 100644
--- a/stream/ai_oss.c
+++ b/stream/ai_oss.c
@@ -36,6 +36,8 @@
#endif
#endif
+#include "osdep/io.h"
+
#include "audio_in.h"
#include "mpvcore/mp_msg.h"
@@ -85,7 +87,7 @@ int ai_oss_init(audio_in_t *ai)
int err;
int ioctl_param;
- ai->oss.audio_fd = open(ai->oss.device, O_RDONLY);
+ ai->oss.audio_fd = open(ai->oss.device, O_RDONLY | O_CLOEXEC);
if (ai->oss.audio_fd < 0)
{
mp_tmsg(MSGT_TV, MSGL_ERR, "Unable to open '%s': %s\n",