diff options
author | Dim-P <Dim-P@users.noreply.github.com> | 2023-02-09 15:31:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-09 15:31:23 +0000 |
commit | 52e5978f73566291004607c2c06318f61774f834 (patch) | |
tree | 647a40aed5b9d00977fe1b420d478d218f85ba83 /libnetdata/libnetdata.c | |
parent | 2ec714523a071f0b72cf91ce1fe8e412bf97509a (diff) |
Fix compiler error when CLOSE_RANGE_CLOEXEC is missing (#14430)
Fixes the issue introduced as a result of #14213, where the agent fails to build successfully on FreeBSD < 13.1 and on environments with Linux kernel version < 5.11, due to missing 'CLOSE_RANGE_CLOEXEC' .
Diffstat (limited to 'libnetdata/libnetdata.c')
-rw-r--r-- | libnetdata/libnetdata.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libnetdata/libnetdata.c b/libnetdata/libnetdata.c index efdc4e5226..5f5c710785 100644 --- a/libnetdata/libnetdata.c +++ b/libnetdata/libnetdata.c @@ -2011,21 +2011,24 @@ void for_each_open_fd(OPEN_FD_ACTION action, OPEN_FD_EXCLUDE excluded_fds){ if(!(excluded_fds & OPEN_FD_EXCLUDE_STDIN)) (void)close(STDIN_FILENO); if(!(excluded_fds & OPEN_FD_EXCLUDE_STDOUT)) (void)close(STDOUT_FILENO); if(!(excluded_fds & OPEN_FD_EXCLUDE_STDERR)) (void)close(STDERR_FILENO); +#if defined(HAVE_CLOSE_RANGE) + if(close_range(STDERR_FILENO + 1, ~0U, 0) == 0) return; + error("close_range() failed, will try to close fds one by one"); +#endif break; case OPEN_FD_ACTION_FD_CLOEXEC: if(!(excluded_fds & OPEN_FD_EXCLUDE_STDIN)) (void)fcntl(STDIN_FILENO, F_SETFD, FD_CLOEXEC); if(!(excluded_fds & OPEN_FD_EXCLUDE_STDOUT)) (void)fcntl(STDOUT_FILENO, F_SETFD, FD_CLOEXEC); if(!(excluded_fds & OPEN_FD_EXCLUDE_STDERR)) (void)fcntl(STDERR_FILENO, F_SETFD, FD_CLOEXEC); +#if defined(HAVE_CLOSE_RANGE) && defined(CLOSE_RANGE_CLOEXEC) // Linux >= 5.11, FreeBSD >= 13.1 + if(close_range(STDERR_FILENO + 1, ~0U, CLOSE_RANGE_CLOEXEC) == 0) return; + error("close_range() failed, will try to mark fds for closing one by one"); +#endif break; default: break; // do nothing } -#if defined(HAVE_CLOSE_RANGE) - if(close_range(STDERR_FILENO + 1, ~0U, (action == OPEN_FD_ACTION_FD_CLOEXEC ? CLOSE_RANGE_CLOEXEC : 0)) == 0) return; - error("close_range() failed, will try to close fds manually"); -#endif - DIR *dir = opendir("/proc/self/fd"); if (dir == NULL) { struct rlimit rl; |