fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-16 14:16:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for posix_spawn_file_actions_addclosefrom_np by @fffe

Browse Source
This commit is contained in:
fffe
2026-07-03 04:52:26 -07:00
committed by GitHub
parent d99cd5eb73
commit 9884c9dd9b
3 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+1
View File
@@ -73,6 +73,7 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS $ZLIB_CFLAGS $DEPENDENCIES_CFLAGS
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS $ZLIB_CFLAGS $DEPENDENCIES_CFLAGS" CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS $ZLIB_CFLAGS $DEPENDENCIES_CFLAGS"
TORRENT_CHECK_CACHELINE TORRENT_CHECK_CACHELINE
TORRENT_CHECK_POSIX_SPAWN_ADDCLOSEFROM_NP
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
scripts/checks.m4
+18
View File
@@ -298,6 +298,24 @@ AC_DEFUN([TORRENT_DISABLE_PTHREAD_SETNAME_NP], [
]) ])
AC_DEFUN([TORRENT_CHECK_POSIX_SPAWN_ADDCLOSEFROM_NP], [
AC_MSG_CHECKING(for posix_spawn_file_actions_addclosefrom_np)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#define _GNU_SOURCE
#include <spawn.h>
]], [[
posix_spawn_file_actions_t actions;
posix_spawn_file_actions_addclosefrom_np(&actions, 3);
]])],[
AC_DEFINE(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP, 1, [Define if posix_spawn_file_actions_addclosefrom_np is available.])
AC_MSG_RESULT(yes)
],[
AC_MSG_RESULT(no)
])
])
AC_DEFUN([TORRENT_WITH_SYSTEMD], [ AC_DEFUN([TORRENT_WITH_SYSTEMD], [
AC_ARG_WITH(systemd, AC_ARG_WITH(systemd,
AS_HELP_STRING([--with-systemd],[enable systemd socket activation support [[default=no]]]), AS_HELP_STRING([--with-systemd],[enable systemd socket activation support [[default=no]]]),
src/rpc/exec_file.cc
+16 -9
View File
@@ -43,6 +43,22 @@ ExecFile::execute(const char* file, char* const* argv, int flags) {
if (posix_spawn_file_actions_init(&actions) != 0) if (posix_spawn_file_actions_init(&actions) != 0)
throw torrent::internal_error("ExecFile::execute(...) posix_spawn_file_actions_init failed."); throw torrent::internal_error("ExecFile::execute(...) posix_spawn_file_actions_init failed.");
posix_spawnattr_t attr;
posix_spawnattr_init(&attr);
short spawn_flags = 0;
// Try to avoid leaking open fds to the spawned process. Prefer POSIX_SPAWN_CLOEXEC_DEFAULT
// (macOS-only) or posix_spawn_file_actions_addclosefrom_np (glibc >= 2.34, FreeBSD >= 13.1).
//
// Other platforms like musl libc, OpenBSD and NetBSD must rely on explicit O_CLOEXEC.
#if defined(POSIX_SPAWN_CLOEXEC_DEFAULT)
spawn_flags |= POSIX_SPAWN_CLOEXEC_DEFAULT;
#elif defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP)
posix_spawn_file_actions_addclosefrom_np(&actions, 3);
#endif
// Handle standard input redirection (/dev/null), posix_spawn_file_actions_addopen handles opening // Handle standard input redirection (/dev/null), posix_spawn_file_actions_addopen handles opening
// and dup2 natively // and dup2 natively
if (posix_spawn_file_actions_addopen(&actions, 0, "/dev/null", O_RDWR, 0) != 0) { if (posix_spawn_file_actions_addopen(&actions, 0, "/dev/null", O_RDWR, 0) != 0) {
@@ -76,15 +92,6 @@ ExecFile::execute(const char* file, char* const* argv, int flags) {
posix_spawn_file_actions_addopen(&actions, 2, "/dev/null", O_RDWR, 0); posix_spawn_file_actions_addopen(&actions, 2, "/dev/null", O_RDWR, 0);
} }
posix_spawnattr_t attr;
posix_spawnattr_init(&attr);
short spawn_flags = 0;
#ifdef POSIX_SPAWN_CLOEXEC_DEFAULT
spawn_flags |= POSIX_SPAWN_CLOEXEC_DEFAULT;
#endif
if (flags & flag_background) { if (flags & flag_background) {
#ifdef POSIX_SPAWN_SETSID #ifdef POSIX_SPAWN_SETSID
spawn_flags |= POSIX_SPAWN_SETSID; spawn_flags |= POSIX_SPAWN_SETSID;