From 500892f115aea9788da7649b59baaea38729aacf Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sat, 9 Sep 2017 12:06:59 -0400 Subject: Try /proc/self/fd before /dev/fd On Solaris, /proc/self/fd is dynamic while /dev/fd is static. --- eval.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index a387bdc..6c25e18 100644 --- a/eval.c +++ b/eval.c @@ -1147,9 +1147,12 @@ static int infer_fdlimit(const struct cmdline *cmdline) { // 3 for std{in,out,err} int nopen = 3 + cmdline->nopen_files; - // Check /dev/fd for the current number of open fds, if possible (we may - // have inherited more than just the standard ones) - DIR *dir = opendir("/dev/fd"); + // Check /proc/self/fd for the current number of open fds, if possible + // (we may have inherited more than just the standard ones) + DIR *dir = opendir("/proc/self/fd"); + if (!dir) { + dir = opendir("/dev/fd"); + } if (dir) { // Account for 'dir' itself nopen = -1; -- cgit v1.2.3