diff options
| -rw-r--r-- | eval.c | 9 | ||||
| -rwxr-xr-x | tests.sh | 10 |
2 files changed, 14 insertions, 5 deletions
@@ -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; @@ -510,12 +510,18 @@ function bfs_diff() ( ) function closefrom() { - for fd in /dev/fd/*; do + if [ -d /proc/self/fd ]; then + local fds=/proc/self/fd + else + local fds=/dev/fd + fi + + for fd in "$fds"/*; do if [ ! -e "$fd" ]; then continue fi - fd="${fd##*/}" + local fd="${fd##*/}" if [ "$fd" -ge "$1" ]; then eval "exec ${fd}<&-" fi |