summaryrefslogtreecommitdiffstats
path: root/io.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-05 15:35:21 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-05 15:35:21 +0000
commit268a6dcd9143db2b1dfe6bbf3ba5f87193ad7f39 (patch)
treed0946322fa7be92fb933c652b44faf2cd56aaf14 /io.c
parent9539cba2febc8afa8178db497816e1f61dc07872 (diff)
downloadruby-268a6dcd9143db2b1dfe6bbf3ba5f87193ad7f39.tar.gz
ruby-268a6dcd9143db2b1dfe6bbf3ba5f87193ad7f39.tar.xz
ruby-268a6dcd9143db2b1dfe6bbf3ba5f87193ad7f39.zip
* io.c (rb_close_before_exec): more heuristics to detect maximum fd.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/io.c b/io.c
index ffb407375..46136d7ee 100644
--- a/io.c
+++ b/io.c
@@ -4452,8 +4452,13 @@ rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds)
fcntl(fd, F_SETFD, ret|FD_CLOEXEC);
}
#else
- close(fd);
+ ret = close(fd);
#endif
+#define CONTIGUOUS_CLOSED_FDS 20
+ if (ret != -1) {
+ if (max < fd + CONTIGUOUS_CLOSED_FDS)
+ max = fd + CONTIGUOUS_CLOSED_FDS;
+ }
}
}