From d870361e033e4e32149981013da0b96be3ae17f5 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 23 May 2002 15:37:06 +0000 Subject: [PATCH] on success, close the pipes from the child. Fix from Tim. 2002-05-23 Havoc Pennington * glib/gspawn.c (fork_exec_with_pipes): on success, close the pipes from the child. Fix from Tim. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gspawn.c | 4 +++- 8 files changed, 38 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6a41865b7..ba5c566af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-05-23 Havoc Pennington + + * glib/gspawn.c (fork_exec_with_pipes): on success, close the + pipes from the child. Fix from Tim. + 2002-05-22 jacob berkman * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6a41865b7..ba5c566af 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-05-23 Havoc Pennington + + * glib/gspawn.c (fork_exec_with_pipes): on success, close the + pipes from the child. Fix from Tim. + 2002-05-22 jacob berkman * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 6a41865b7..ba5c566af 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2002-05-23 Havoc Pennington + + * glib/gspawn.c (fork_exec_with_pipes): on success, close the + pipes from the child. Fix from Tim. + 2002-05-22 jacob berkman * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6a41865b7..ba5c566af 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-05-23 Havoc Pennington + + * glib/gspawn.c (fork_exec_with_pipes): on success, close the + pipes from the child. Fix from Tim. + 2002-05-22 jacob berkman * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6a41865b7..ba5c566af 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-05-23 Havoc Pennington + + * glib/gspawn.c (fork_exec_with_pipes): on success, close the + pipes from the child. Fix from Tim. + 2002-05-22 jacob berkman * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6a41865b7..ba5c566af 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-05-23 Havoc Pennington + + * glib/gspawn.c (fork_exec_with_pipes): on success, close the + pipes from the child. Fix from Tim. + 2002-05-22 jacob berkman * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6a41865b7..ba5c566af 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-05-23 Havoc Pennington + + * glib/gspawn.c (fork_exec_with_pipes): on success, close the + pipes from the child. Fix from Tim. + 2002-05-22 jacob berkman * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop diff --git a/glib/gspawn.c b/glib/gspawn.c index bf152f469..d8ed1d914 100644 --- a/glib/gspawn.c +++ b/glib/gspawn.c @@ -1202,7 +1202,9 @@ fork_exec_with_pipes (gboolean intermediate_child, } /* Success against all odds! return the information */ - + close_and_invalidate (&child_err_report_pipe[0]); + close_and_invalidate (&child_pid_report_pipe[0]); + if (child_pid) *child_pid = pid;