From: Matthias Clasen Date: Sun, 6 Jan 2008 23:12:24 +0000 (+0000) Subject: Fix fdwalk on OS X X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=6554c8509f01f033c33ce6a7ff32f5d767ce7164;p=dana%2Fcg-glib.git Fix fdwalk on OS X svn path=/trunk/; revision=6253 --- diff --git a/ChangeLog b/ChangeLog index a0764b1d..0a9e6be2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-01-06 Matthias Clasen + + * glib/gspawn.c (fdwalk): Don't set open_max to + RLIM_INFINITY. (#495589, Tommi Komulainen) + 2008-01-06 Matthias Clasen * README.in, INSTALL.in: Document new dependencies. diff --git a/glib/gspawn.c b/glib/gspawn.c index e545b4e7..9fc3ac87 100644 --- 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