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

Fix the recent fdwalk()-related changes to not break mapping-test.

Browse Source 
* glib/gspawn.c: Fix the recent fdwalk()-related changes
        to not break mapping-test.  (#286838, Marco Barisione)
This commit is contained in:
Matthias Clasen 2006-12-17 17:45:03 +00:00
parent 80cc5b6c3e
commit a7d0392b4d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-12-17 Matthias Clasen <mclasen@redhat.com>
* glib/gspawn.c: Fix the recent fdwalk()-related changes
to not break mapping-test. (#286838, Marco Barisione)
* glib/gstring.c (g_string_chunk_new): Don't shadow size.
(#386760, Kazuki IWAMOTO)

10
glib/gspawn.c
View File

@ -853,11 +853,13 @@ write_err_and_exit (gint fd, gint msg)
_exit (1);
}
static void
static int
set_cloexec (void *data, gint fd)
{
if (fd > 2)
if (fd >= GPOINTER_TO_INT (data))
fcntl (fd, F_SETFD, FD_CLOEXEC);
return 0;
}
#ifndef HAVE_FDWALK
@ -926,12 +928,12 @@ do_exec (gint child_err_report_fd,
*/
if (close_descriptors)
{
fdwalk (set_cloexec, NULL);
fdwalk (set_cloexec, GINT_TO_POINTER(3));
}
else
{
/* We need to do child_err_report_fd anyway */
set_cloexec (NULL, child_err_report_fd);
set_cloexec (GINT_TO_POINTER(0), child_err_report_fd);
}
/* Redirect pipes as required */