diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-13 17:15:59 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-13 17:15:59 +0000 |
| commit | ff2a76910f4b4da1741e9888f673343099784045 (patch) | |
| tree | 347a727d55562dd12b4c49bff87322abc28255b9 /libnetdata/libnetdata.c | |
| parent | Adding upstream version 1.38.0. (diff) | |
| download | netdata-ff2a76910f4b4da1741e9888f673343099784045.tar.xz netdata-ff2a76910f4b4da1741e9888f673343099784045.zip | |
Adding upstream version 1.38.1.upstream/1.38.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
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 f6b6b026..666344a9 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; |