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_dvb.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_dvb.c')
-rw-r--r-- | stream/stream_dvb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index b34e80b226..71e9b87199 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -42,10 +42,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <fcntl.h> #include <errno.h> +#include <libavutil/avstring.h> + +#include "osdep/io.h" + #include "stream.h" #include "mpvcore/m_option.h" #include "mpvcore/path.h" -#include "libavutil/avstring.h" #include "dvbin.h" @@ -735,7 +738,7 @@ dvb_config_t *dvb_get_config(void) for(i=0; i<MAX_CARDS; i++) { snprintf(filename, sizeof(filename), "/dev/dvb/adapter%d/frontend0", i); - fd = open(filename, O_RDONLY|O_NONBLOCK); + fd = open(filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC); if(fd < 0) { mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't open device %s, skipping\n", filename); |