diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2023-05-07 20:47:51 -0400 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2023-05-07 20:47:51 -0400 |
| commit | 9f0b30b5cafbeb8409a1ebc285b3de3142d5df88 (patch) | |
| tree | ee0ec9a46fac53ff792dccd446b07a1c48aef20b | |
| parent | ab182987fefa90ce8850fe11db9f5d9a5e15b4b1 (diff) | |
| download | lighttpd-git-9f0b30b5cafbeb8409a1ebc285b3de3142d5df88.tar.gz | |
[core] posix_spawnattr_setcwd_np() on QNX
use posix_spawnattr_setcwd_np() (QNX Neutrino 7.1 or later)
NOTE: HAVE_POSIX_SPAWNATTR_SETCWD_NP *is not* currently checked and set
in the builds, so must be manually defined for build in order to enable.
| -rw-r--r-- | src/fdevent.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/fdevent.c b/src/fdevent.c index bcfbec6a..1c704fd9 100644 --- a/src/fdevent.c +++ b/src/fdevent.c @@ -486,8 +486,16 @@ pid_t fdevent_fork_execve(const char *name, char *argv[], char *envp[], int fdin &file_actions, dfd) : 0) #endif + #ifdef HAVE_POSIX_SPAWNATTR_SETCWD_NP /* (QNX Neutrino 7.1 or later) */ + && 0 == (rc = posix_spawnattr_setcwd_np(&attr, dfd)) + && 0 == (rc = posix_spawnattr_setxflags(&spawnattr, + POSIX_SPAWN_SETCWD + | POSIX_SPAWN_SETSIGDEF + | POSIX_SPAWN_SETSIGMASK)) + #else && 0 == (rc = posix_spawnattr_setflags( &attr, POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK)) + #endif && 0 == (rc = sigemptyset(&sigs)) && 0 == (rc = posix_spawnattr_setsigmask(&attr, &sigs)) /*(force reset signals to SIG_DFL if server.c set to SIG_IGN)*/ @@ -504,7 +512,8 @@ pid_t fdevent_fork_execve(const char *name, char *argv[], char *envp[], int fdin && 0 == (rc = sigaddset(&sigs, SIGUSR1)) && 0 == (rc = posix_spawnattr_setsigdefault(&attr, &sigs))) { - #ifndef HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR_NP + #if !defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR_NP) \ + && !defined(HAVE_POSIX_SPAWNATTR_SETCWD_NP) /* not thread-safe, but ok since lighttpd not (currently) threaded * (alternatively, check HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR_NP * along with HAVE_POSIX_SPAWN at top of block and use HAVE_FORK @@ -524,7 +533,8 @@ pid_t fdevent_fork_execve(const char *name, char *argv[], char *envp[], int fdin if (0 != rc) pid = -1; - #ifndef HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR_NP + #if !defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR_NP) \ + && !defined(HAVE_POSIX_SPAWNATTR_SETCWD_NP) if (-1 != dfd) { if (0 != fchdir(dfd)) { /* ignore error; best effort */ /*rc = errno;*/ |