luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 12:25:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

gsubprocess: Fall back to plain F_DUPFD+fcntl for OS X <= Snow Lion

Browse Source 
Since it apparently doesn't have F_DUPFD_CLOEXEC.

https://bugzilla.gnome.org/show_bug.cgi?id=710962
This commit is contained in:
Colin Walters 2013-10-27 10:21:13 -04:00
parent 00b35c78f8
commit 6bb9d17e40
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gio/gsubprocess.c
View File

@ -200,6 +200,34 @@ unset_cloexec (int fd)
} }
} }
static int
dupfd_cloexec (int parent_fd)
{
int fd;
#ifdef F_DUPFD_CLOEXEC
do
fd = fcntl (parent_fd, F_DUPFD_CLOEXEC, 3);
while (fd == -1 && errno == EINTR);
#else
/* OS X Snow Lion and earlier don't have F_DUPFD_CLOEXEC:
* https://bugzilla.gnome.org/show_bug.cgi?id=710962
*/
int result, flags;
do
fd = fcntl (parent_fd, F_DUPFD, 3);
while (fd == -1 && errno == EINTR);
flags = fcntl (fd, F_GETFD, 0);
if (flags != -1)
{
flags |= FD_CLOEXEC;
do
result = fcntl (fd, F_SETFD, flags);
while (result == -1 && errno == EINTR);
}
#endif
return fd;
}
/** /**
* Based on code derived from * Based on code derived from
* gnome-terminal:src/terminal-screen.c:terminal_screen_child_setup(), * gnome-terminal:src/terminal-screen.c:terminal_screen_child_setup(),
@ -251,9 +279,7 @@ child_setup (gpointer user_data)
gint parent_fd = g_array_index (child_data->needdup_fd_assignments, int, i); gint parent_fd = g_array_index (child_data->needdup_fd_assignments, int, i);
gint new_parent_fd; gint new_parent_fd;
do new_parent_fd = dupfd_cloexec (parent_fd);
new_parent_fd = fcntl (parent_fd, F_DUPFD_CLOEXEC, 3);
while (parent_fd == -1 && errno == EINTR);
g_array_index (child_data->needdup_fd_assignments, int, i) = new_parent_fd; g_array_index (child_data->needdup_fd_assignments, int, i) = new_parent_fd;
} }