Fix fdwalk on OS X

svn path=/trunk/; revision=6253

diff --git a/ChangeLog b/ChangeLog
index a0764b1d4c988418ef4cff29b0dafc47bba04568..0a9e6be20685c902ff67444d3e960534a72701b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/glib/gspawn.c b/glib/gspawn.c
index e545b4e750f5ff4a991911286e950092096285f8..9fc3ac87aed7e8bfbb3d80754ebc6dcc599f6b3f 100644 (file)
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -941,7 +941,7 @@ fdwalk (int (*cb)(void *data, int fd), void *data)
   
 #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