From c4785f1b99bd479926514c48fe0b5489eccfdfaa Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 30 Aug 2023 13:34:23 +0200 Subject: [PATCH] misc: add syscall fallback for close_range for musl libc Add fallback for the close_range syscall wrapper. This is needed for musl libc, which currently does not have a close_range wrapper. Also set errno on errors. --- meson.build | 2 ++ src/shared/misc.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/meson.build b/meson.build index e77cae09..d1a8bd5b 100644 --- a/meson.build +++ b/meson.build @@ -197,6 +197,8 @@ endif if cc.has_function('close_range', prefix: '#define _GNU_SOURCE\n#include ') add_project_arguments('-DHAVE_CLOSE_RANGE', language: 'c') +elif cc.has_header('linux/close_range.h') + add_project_arguments('-DHAVE_LINUX_CLOSE_RANGE_H', language: 'c') endif if cc.has_function('strlcpy', prefix: '#define _GNU_SOURCE\n#include ') diff --git a/src/shared/misc.c b/src/shared/misc.c index 429407d4..28f4e235 100644 --- a/src/shared/misc.c +++ b/src/shared/misc.c @@ -24,6 +24,9 @@ #include #include #include +#ifdef HAVE_LINUX_CLOSE_RANGE_H +# include +#endif #include #include #include @@ -31,6 +34,7 @@ #include #include #ifdef __linux__ +# include /* for close_range */ # include #endif #include @@ -511,7 +515,12 @@ static inline int close_range(int first RC_UNUSED, int last RC_UNUSED, unsigned int flags RC_UNUSED) { +#ifdef SYS_close_range + return syscall(SYS_close_range, first, last, flags); +#else + errno = ENOSYS; return -1; +#endif } #endif #ifndef CLOSE_RANGE_CLOEXEC