diff options
author | wm4 <wm4@nowhere> | 2013-11-30 22:40:51 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-30 22:40:51 +0100 |
commit | 95cfe58e3db9d939abe7a9a26116c1d576eed60b (patch) | |
tree | 98a4738f2f989c900702d84ef8a257f9413389af /stream/stream_vcd.c | |
parent | eea69682a6a874d540f9fc576c937466970713f6 (diff) | |
download | mpv-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/stream_vcd.c')
-rw-r--r-- | stream/stream_vcd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c index 4c6dbcc074..0bc7e14f53 100644 --- a/stream/stream_vcd.c +++ b/stream/stream_vcd.c @@ -56,6 +56,8 @@ #define vcd_close(priv) (close(((mp_vcd_priv_t*)priv)->fd)) #endif +#include "osdep/io.h" + static int fill_buffer(stream_t *s, char* buffer, int max_len){ if(s->pos > s->end_pos) /// don't past end of current track return 0; @@ -112,7 +114,7 @@ static int open_s(stream_t *stream,int mode) OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); f = _open_osfhandle((intptr_t)hd, _O_RDONLY); #else - f=open(dev,O_RDONLY); + f=open(dev,O_RDONLY | O_CLOEXEC); #endif if(f<0){ mp_tmsg(MSGT_OPEN,MSGL_ERR,"CD-ROM Device '%s' not found.\n",dev); |