glib r6253 - in trunk: . glib

[matthiasc svn gnome org]

Author: matthiasc
Date: Sun Jan  6 23:12:24 2008
New Revision: 6253
URL: http://svn.gnome.org/viewvc/glib?rev=6253&view=rev

Log:
Fix fdwalk on OS X


Modified:
   trunk/ChangeLog
   trunk/glib/gspawn.c

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Sun Jan  6 23:12:24 2008
@@ -1,5 +1,10 @@
 2008-01-06  Matthias Clasen  <mclasen redhat com>
 
+	* glib/gspawn.c (fdwalk): Don't set open_max to
+	RLIM_INFINITY.  (#495589, Tommi Komulainen)
+
+2008-01-06  Matthias Clasen  <mclasen redhat com>
+
 	* README.in, INSTALL.in: Document new dependencies.
 
 2008-01-06  Matthias Clasen  <mclasen redhat com>

Modified: trunk/glib/gspawn.c
==============================================================================
--- trunk/glib/gspawn.c	(original)
+++ trunk/glib/gspawn.c	Sun Jan  6 23:12:24 2008
@@ -941,7 +941,7 @@
   
 #ifdef HAVE_SYS_RESOURCE_H
       
-  if (getrlimit(RLIMIT_NOFILE, &rl) == 0)
+  if (getrlimit(RLIMIT_NOFILE, &rl) == 0 && rl.rlim_max != RLIM_INFINITY)
       open_max = rl.rlim_max;
   else
 #endif