Mark simple file and socket descriptors as uninheritable.

This patch creates two utility functions:

  int open_cloexec(pathname, flags)
  int create_cloexec(pathname, flags, mode)

These return a file descriptor with the CLOEXEC flag set, to ensure
that the descriptor is not inherited across a fork/exec operation.

The sockets returned by:

  _x_io_tcp_connect_ipv4()
  _x_io_tcp_connect()

now also have their CLOEXEC flag set.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 5d38cb4e4..3947e6ab4 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -822,7 +822,7 @@ static int open_radio_capture_device(v4l_input_plugin_t *this)
   entry = this->stream->xine->config->lookup_entry(this->stream->xine->config,
                                                    "media.video4linux.radio_device");
 
-  if((this->radio_fd = open(entry->str_value, O_RDWR)) < 0) {
+  if((this->radio_fd = open_cloexec(entry->str_value, O_RDWR)) < 0) {
     xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
             "input_v4l: error opening v4l device (%s): %s\n",
             entry->str_value, strerror(errno));
@@ -875,7 +875,7 @@ static int open_video_capture_device(v4l_input_plugin_t *this)
                                                    "media.video4linux.video_device");
 
   /* Try to open the video device */
-  if((this->video_fd = open(entry->str_value, O_RDWR)) < 0) {
+  if((this->video_fd = open_cloexec(entry->str_value, O_RDWR)) < 0) {
     xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
             "input_v4l: error opening v4l device (%s): %s\n",
             entry->str_value, strerror(errno));
@@ -1568,7 +1568,7 @@ static void v4l_plugin_dispose (input_plugin_t *this_gen) {
   if (this->tuner_name)
     free(this->tuner_name);
 
-  /* Close video device only if device was openend */
+  /* Close video device only if device was opened */
   if (this->video_fd > 0) {
 
     /* Restore v4l audio volume */
@@ -1799,7 +1799,7 @@ static input_plugin_t *v4l_class_get_video_instance (input_class_t *cls_gen,
                                                    "media.video4linux.video_device");
 
   /* Try to open the video device */
-  if((this->video_fd = open(entry->str_value, O_RDWR)) < 0) {
+  if((this->video_fd = open_cloexec(entry->str_value, O_RDWR)) < 0) {
     xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
             "input_v4l: error opening v4l device (%s): %s\n",
             entry->str_value, strerror(errno));
@@ -1862,7 +1862,7 @@ static input_plugin_t *v4l_class_get_radio_instance (input_class_t *cls_gen,
   entry = this->stream->xine->config->lookup_entry(this->stream->xine->config,
                                                    "media.video4linux.radio_device");
 
-  if((this->radio_fd = open(entry->str_value, O_RDWR)) < 0) {
+  if((this->radio_fd = open_cloexec(entry->str_value, O_RDWR)) < 0) {
     xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
             "input_v4l: error opening v4l device (%s): %s\n",
             entry->str_value, strerror(errno));