emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

supervise-daemon: rename HAVE_CLOSE_RANGE_EXEC to HAVE_CLOSE_RANGE

Browse Source 
Use HAVE_CLOSE_RANGE to tell if system provides a close_range(2)
wrapper, which better explains the purpose.

Add a compat inline which returns -1 if close_range is unavailable.
This commit is contained in:
Natanael Copa 2023-08-30 11:33:37 +02:00 committed by William Hubbs
parent b2c4eb97b5
commit 5bfb592d75
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -198,9 +198,8 @@ endif
if cc.has_function('closefrom', prefix: '#define _GNU_SOURCE\n#include <unistd.h>') if cc.has_function('closefrom', prefix: '#define _GNU_SOURCE\n#include <unistd.h>')
add_project_arguments('-DHAVE_CLOSEFROM', language: 'c') add_project_arguments('-DHAVE_CLOSEFROM', language: 'c')
endif endif
if cc.has_function('close_range', prefix: '#define _GNU_SOURCE\n#include <unistd.h>') and \ if cc.has_function('close_range', prefix: '#define _GNU_SOURCE\n#include <unistd.h>')
cc.has_header_symbol('unistd.h', 'CLOSE_RANGE_CLOEXEC', prefix: '#define _GNU_SOURCE') add_project_arguments('-DHAVE_CLOSE_RANGE', language: 'c')
add_project_arguments('-DHAVE_CLOSE_RANGE_CLOEXEC', language: 'c')
endif endif
if cc.has_function('strlcpy', prefix: '#define _GNU_SOURCE\n#include <string.h>') if cc.has_function('strlcpy', prefix: '#define _GNU_SOURCE\n#include <string.h>')

16
src/supervise-daemon/supervise-daemon.c
View File

@ -22,7 +22,7 @@
#define ONE_SECOND 1000000000 #define ONE_SECOND 1000000000
#define ONE_MS 1000000 #define ONE_MS 1000000
#ifdef HAVE_CLOSE_RANGE_CLOEXEC #ifdef HAVE_CLOSE_RANGE
/* For close_range() */ /* For close_range() */
# define _GNU_SOURCE # define _GNU_SOURCE
#endif #endif
@ -203,6 +203,18 @@ static inline int ioprio_set(int which RC_UNUSED, int who RC_UNUSED,
} }
#endif #endif
#ifndef CLOSE_RANGE_CLOEXEC
# define CLOSE_RANGE_CLOEXEC (1U << 2)
#endif
#ifndef HAVE_CLOSE_RANGE
static inline int close_range(int first RC_UNUSED,
int last RC_UNUSED,
unsigned int flags RC_UNUSED)
{
return -1;
}
#endif
static void cleanup(void) static void cleanup(void)
{ {
free(changeuser); free(changeuser);
@ -570,9 +582,7 @@ RC_NORETURN static void child_process(char *exec, char **argv)
if (redirect_stderr || rc_yesno(getenv("EINFO_QUIET"))) if (redirect_stderr || rc_yesno(getenv("EINFO_QUIET")))
dup2(stderr_fd, STDERR_FILENO); dup2(stderr_fd, STDERR_FILENO);
#ifdef HAVE_CLOSE_RANGE_CLOEXEC
if (close_range(3, UINT_MAX, CLOSE_RANGE_CLOEXEC) < 0) if (close_range(3, UINT_MAX, CLOSE_RANGE_CLOEXEC) < 0)
#endif
for (i = getdtablesize() - 1; i >= 3; --i) for (i = getdtablesize() - 1; i >= 3; --i)
fcntl(i, F_SETFD, FD_CLOEXEC); fcntl(i, F_SETFD, FD_CLOEXEC);
cmdline = make_cmdline(argv); cmdline = make_cmdline(argv);