diff options
Diffstat (limited to 'libguile/posix.c')
| -rw-r--r-- | libguile/posix.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libguile/posix.c b/libguile/posix.c index b5830c43b..3adc743c4 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -1322,6 +1322,12 @@ SCM_DEFINE (scm_fork, "primitive-fork", 0, 0, 0, #undef FUNC_NAME #endif /* HAVE_FORK */ +#ifdef HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP +# define HAVE_ADDCLOSEFROM 1 +#endif + +#ifndef HAVE_ADDCLOSEFROM + static void close_inherited_fds (posix_spawn_file_actions_t *actions, int max_fd) { @@ -1346,6 +1352,8 @@ close_inherited_fds (posix_spawn_file_actions_t *actions, int max_fd) } } +#endif + static pid_t do_spawn (char *exec_file, char **exec_argv, char **exec_env, int in, int out, int err, int spawnp) @@ -1389,7 +1397,13 @@ do_spawn (char *exec_file, char **exec_argv, char **exec_env, posix_spawn_file_actions_adddup2 (&actions, fd_slot[1], 1); posix_spawn_file_actions_adddup2 (&actions, fd_slot[2], 2); +#ifdef HAVE_ADDCLOSEFROM + /* This function appears in glibc 2.34. It's both free from race + conditions and more efficient than the alternative. */ + posix_spawn_file_actions_addclosefrom_np (&actions, 3); +#else close_inherited_fds (&actions, max_fd); +#endif int res = -1; if (spawnp) |