From 6b9cac874c33f4fa27aa4b4b5b980f60c28ee043 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Fri, 29 Dec 2023 17:57:59 +0800 Subject: [PATCH] fd-util: don't eat up errors in fd_cloexec_many Follow-up for ed18c22c989495aab36512f03449222cfcf79aa7 Before this commit, a successful fd_cloexec() call would discard all previously gathered errors. --- src/basic/fd-util.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c index d704c90ade..1a279690d2 100644 --- a/src/basic/fd-util.c +++ b/src/basic/fd-util.c @@ -187,7 +187,7 @@ int fd_cloexec(int fd, bool cloexec) { } int fd_cloexec_many(const int fds[], size_t n_fds, bool cloexec) { - int ret = 0, r; + int r = 0; assert(fds || n_fds == 0); @@ -195,14 +195,13 @@ int fd_cloexec_many(const int fds[], size_t n_fds, bool cloexec) { if (*fd < 0) /* Skip gracefully over already invalidated fds */ continue; - r = fd_cloexec(*fd, cloexec); - if (r < 0) /* Continue going, but return first error */ - RET_GATHER(ret, r); - else - ret = 1; /* report if we did anything */ + RET_GATHER(r, fd_cloexec(*fd, cloexec)); + + if (r >= 0) + r = 1; /* report if we did anything */ } - return ret; + return r; } static bool fd_in_set(int fd, const int fds[], size_t n_fds) {