From 7da0d28318c97f1f3d629f13daad9ec824254709 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Fri, 15 Dec 2017 12:40:37 -0500 Subject: Keep track of required FDs per-expr --- eval.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index d13b548..88616cc 100644 --- a/eval.c +++ b/eval.c @@ -1195,7 +1195,9 @@ static int infer_fdlimit(const struct cmdline *cmdline) { closedir(dir); } - ret -= nopen + cmdline->persistent_fds + cmdline->ephemeral_fds; + ret -= nopen; + ret -= cmdline->expr->persistent_fds; + ret -= cmdline->expr->ephemeral_fds; // bftw() needs at least 2 available fds if (ret < 2) { -- cgit v1.2.3