diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-05 00:11:21 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-05 00:11:21 +0100 |
| commit | e4b75132a31fef25960ea7abbf5dace418b1fc37 (patch) | |
| tree | f219c6fcf2ec0d8f1c58102872edf9d347dfa4a6 /src/vdr/input_vdr.c | |
| parent | 6a2b53c22febcbc2041d760dccd795f388bc10c4 (diff) | |
| parent | 24cb81b12aa9ab7c351f917fa2027ee251a5be7f (diff) | |
| download | xine-lib-e4b75132a31fef25960ea7abbf5dace418b1fc37.tar.gz xine-lib-e4b75132a31fef25960ea7abbf5dace418b1fc37.tar.bz2 | |
Merge commits which I've already merged from 1.1...
Diffstat (limited to 'src/vdr/input_vdr.c')
| -rw-r--r-- | src/vdr/input_vdr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c index ed478c80d..2b0329867 100644 --- a/src/vdr/input_vdr.c +++ b/src/vdr/input_vdr.c @@ -1919,7 +1919,7 @@ static int vdr_plugin_open_fifo_mrl(input_plugin_t *this_gen) filename = strdup(filename); _x_mrl_unescape (filename); - this->fh = open(filename, O_RDONLY | O_NONBLOCK); + this->fh = xine_open_cloexec(filename, O_RDONLY | O_NONBLOCK); lprintf("filename '%s'\n", filename); @@ -1960,7 +1960,7 @@ static int vdr_plugin_open_fifo_mrl(input_plugin_t *this_gen) char *filename_control = 0; asprintf(&filename_control, "%s.control", filename); - this->fh_control = open(filename_control, O_RDONLY); + this->fh_control = xine_open_cloexec(filename_control, O_RDONLY); if (this->fh_control == -1) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, @@ -1980,7 +1980,7 @@ static int vdr_plugin_open_fifo_mrl(input_plugin_t *this_gen) char *filename_result = 0; asprintf(&filename_result, "%s.result", filename); - this->fh_result = open(filename_result, O_WRONLY); + this->fh_result = xine_open_cloexec(filename_result, O_WRONLY); if (this->fh_result == -1) { perror("failed"); @@ -2002,7 +2002,7 @@ static int vdr_plugin_open_fifo_mrl(input_plugin_t *this_gen) char *filename_event = 0; asprintf(&filename_event, "%s.event", filename); - this->fh_event = open(filename_event, O_WRONLY); + this->fh_event = xine_open_cloexec(filename_event, O_WRONLY); if (this->fh_event == -1) { perror("failed"); @@ -2030,7 +2030,7 @@ static int vdr_plugin_open_socket(vdr_input_plugin_t *this, struct hostent *host struct sockaddr_in sain; struct in_addr iaddr; - if ((fd = socket(PF_INET, SOCK_STREAM, 0)) == -1) + if ((fd = xine_socket_cloexec(PF_INET, SOCK_STREAM, 0)) == -1) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("%s: failed to create socket for port %d (%s)\n"), LOG_MODULE, |