on success, close the pipes from the child. Fix from Tim.

2002-05-23  Havoc Pennington  <hp@redhat.com>

	* glib/gspawn.c (fork_exec_with_pipes): on success, close the
	pipes from the child. Fix from Tim.

diff --git a/ChangeLog b/ChangeLog
index 4a01817..d934542 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-23  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gspawn.c (fork_exec_with_pipes): on success, close the
+       pipes from the child. Fix from Tim.
+
 2002-05-22  jacob berkman  <jacob@ximian.com>
 
        * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4a01817..d934542 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-05-23  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gspawn.c (fork_exec_with_pipes): on success, close the
+       pipes from the child. Fix from Tim.
+
 2002-05-22  jacob berkman  <jacob@ximian.com>
 
        * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4a01817..d934542 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2002-05-23  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gspawn.c (fork_exec_with_pipes): on success, close the
+       pipes from the child. Fix from Tim.
+
 2002-05-22  jacob berkman  <jacob@ximian.com>
 
        * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4a01817..d934542 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-05-23  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gspawn.c (fork_exec_with_pipes): on success, close the
+       pipes from the child. Fix from Tim.
+
 2002-05-22  jacob berkman  <jacob@ximian.com>
 
        * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4a01817..d934542 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-05-23  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gspawn.c (fork_exec_with_pipes): on success, close the
+       pipes from the child. Fix from Tim.
+
 2002-05-22  jacob berkman  <jacob@ximian.com>
 
        * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4a01817..d934542 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-05-23  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gspawn.c (fork_exec_with_pipes): on success, close the
+       pipes from the child. Fix from Tim.
+
 2002-05-22  jacob berkman  <jacob@ximian.com>
 
        * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4a01817..d934542 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-05-23  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gspawn.c (fork_exec_with_pipes): on success, close the
+       pipes from the child. Fix from Tim.
+
 2002-05-22  jacob berkman  <jacob@ximian.com>
 
        * m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop

diff --git a/glib/gspawn.c b/glib/gspawn.c
index bf152f4..d8ed1d9 100644 (file)
--- 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;