summaryrefslogtreecommitdiff
path: root/src/libstddjb/child_spawn3.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstddjb/child_spawn3.c')
-rw-r--r--src/libstddjb/child_spawn3.c159
1 files changed, 94 insertions, 65 deletions
diff --git a/src/libstddjb/child_spawn3.c b/src/libstddjb/child_spawn3.c
index 733df74..81ffb0c 100644
--- a/src/libstddjb/child_spawn3.c
+++ b/src/libstddjb/child_spawn3.c
@@ -3,64 +3,54 @@
/* MT-unsafe */
#include <skalibs/sysdeps.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/wait.h>
+
#include <unistd.h>
#include <errno.h>
-#include <signal.h>
+
+#include <skalibs/types.h>
+#include <skalibs/djbunix.h>
#ifdef SKALIBS_HASPOSIXSPAWN
+#include <signal.h>
#include <stdlib.h>
#include <spawn.h>
-#include <skalibs/config.h>
-
-#else
-#include <string.h>
-#include <skalibs/sig.h>
-#include <skalibs/strerr.h>
-#include <skalibs/exec.h>
+#include <skalibs/config.h>
+#include <skalibs/env.h>
+#ifdef SKALIBS_HASPOSIXSPAWNEARLYRETURN
+# include "child_spawn-internal.h"
#endif
-#include <skalibs/types.h>
-#include <skalibs/allreadwrite.h>
-#include <skalibs/env.h>
-#include <skalibs/djbunix.h>
-
pid_t child_spawn3 (char const *prog, char const *const *argv, char const *const *envp, int *fds)
{
pid_t pid ;
-#ifdef SKALIBS_HASPOSIXSPAWN
posix_spawn_file_actions_t actions ;
posix_spawnattr_t attr ;
+ sigset_t set ;
int e ;
-#else
- int syncpipe[2] ;
-#endif
int p[3][2] ;
size_t m = sizeof(SKALIBS_CHILD_SPAWN_FDS_ENVVAR) ;
char modifs[sizeof(SKALIBS_CHILD_SPAWN_FDS_ENVVAR) + UINT_FMT] = SKALIBS_CHILD_SPAWN_FDS_ENVVAR "=" ;
- if (pipe(p[0]) < 0 || ndelay_on(p[0][0]) < 0 || coe(p[0][0]) < 0) return 0 ;
+#ifdef SKALIBS_HASPOSIXSPAWNEARLYRETURN
+ int syncpipe[2] ;
+ if (pipecoe(syncpipe) == -1) return 0 ;
+#endif
+
+ if (pipe(p[0]) < 0 || ndelay_on(p[0][0]) < 0 || coe(p[0][0]) < 0) goto err ;
if (pipe(p[1]) < 0 || ndelay_on(p[1][1]) < 0 || coe(p[1][1]) < 0) goto errp0 ;
if (pipe(p[2]) < 0 || ndelay_on(p[2][0]) < 0 || coe(p[2][0]) < 0) goto errp1 ;
m += uint_fmt(modifs + sizeof(SKALIBS_CHILD_SPAWN_FDS_ENVVAR), p[2][1]) ;
modifs[m++] = 0 ;
-#ifdef SKALIBS_HASPOSIXSPAWN
-
e = posix_spawnattr_init(&attr) ;
if (e) goto erre ;
- {
- sigset_t set ;
- sigemptyset(&set) ;
- e = posix_spawnattr_setsigmask(&attr, &set) ;
- if (e) goto errattr ;
- e = posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSIGMASK) ;
- if (e) goto errattr ;
- }
+ sigemptyset(&set) ;
+ e = posix_spawnattr_setsigmask(&attr, &set) ;
+ if (e) goto errattr ;
+ e = posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSIGMASK) ;
+ if (e) goto errattr ;
e = posix_spawn_file_actions_init(&actions) ;
if (e) goto errattr ;
if (p[1][0] != fds[0])
@@ -77,7 +67,7 @@ pid_t child_spawn3 (char const *prog, char const *const *argv, char const *const
e = posix_spawn_file_actions_addclose(&actions, p[0][1]) ;
if (e) goto erractions ;
}
- {
+ {
int nopath = !getenv("PATH") ;
size_t envlen = env_len(envp) ;
char const *newenv[envlen + 2] ;
@@ -93,46 +83,93 @@ pid_t child_spawn3 (char const *prog, char const *const *argv, char const *const
posix_spawn_file_actions_destroy(&actions) ;
posix_spawnattr_destroy(&attr) ;
+ fd_close(p[2][1]) ;
+ fd_close(p[1][0]) ;
+ fd_close(p[0][1]) ;
+
+#ifdef SKALIBS_HASPOSIXSPAWNEARLYRETURN
+ pid = child_spawn_workaround(pid, syncpipe) ;
+ if (!pid)
+ {
+ fd_close(p[2][0]) ;
+ fd_close(p[1][1]) ;
+ fd_close(p[0][0]) ;
+ return 0 ;
+ }
+#endif
+ fds[0] = p[0][0] ;
+ fds[1] = p[1][1] ;
+ fds[2] = p[2][0] ;
+ return pid ;
+
+ erractions:
+ posix_spawn_file_actions_destroy(&actions) ;
+ errattr:
+ posix_spawnattr_destroy(&attr) ;
+ erre:
+ errno = e ;
+ fd_close(p[2][1]) ;
+ fd_close(p[2][0]) ;
+ errp1:
+ fd_close(p[1][1]) ;
+ fd_close(p[1][0]) ;
+ errp0:
+ fd_close(p[0][1]) ;
+ fd_close(p[0][0]) ;
+ err:
+#ifdef SKALIBS_HASPOSIXSPAWNEARLYRETURN
+ fd_close(syncpipe[1]) ;
+ fd_close(syncpipe[0]) ;
+#endif
+ return 0 ;
+}
#else
+
+#include <skalibs/allreadwrite.h>
+#include <skalibs/sig.h>
+#include <skalibs/exec.h>
+
+pid_t child_spawn3 (char const *prog, char const *const *argv, char const *const *envp, int *fds)
+{
+ pid_t pid ;
+ int syncpipe[2] ;
+ int p[3][2] ;
+ size_t m = sizeof(SKALIBS_CHILD_SPAWN_FDS_ENVVAR) ;
+ char modifs[sizeof(SKALIBS_CHILD_SPAWN_FDS_ENVVAR) + UINT_FMT] = SKALIBS_CHILD_SPAWN_FDS_ENVVAR "=" ;
+ char c ;
+
+ if (pipe(p[0]) == -1 || ndelay_on(p[0][0]) == -1 || coe(p[0][0]) == -1) return 0 ;
+ if (pipe(p[1]) == -1 || ndelay_on(p[1][1]) == -1 || coe(p[1][1]) == -1) goto errp0 ;
+ if (pipe(p[2]) == -1 || ndelay_on(p[2][0]) == -1 || coe(p[2][0]) == -1) goto errp1 ;
+ m += uint_fmt(modifs + sizeof(SKALIBS_CHILD_SPAWN_FDS_ENVVAR), p[2][1]) ;
+ modifs[m++] = 0 ;
if (pipecoe(syncpipe) < 0) goto errp2 ;
pid = fork() ;
if (pid < 0) goto errsp ;
else if (!pid)
{
- size_t len = strlen(PROG) ;
- char name[len + 9] ;
- memcpy(name, PROG, len) ;
- memcpy(name + len, " (child)", 9) ;
- PROG = name ;
- if (fd_move2(fds[0], p[1][0], fds[1], p[0][1]) < 0) goto syncdie ;
+ if (fd_move2(fds[0], p[1][0], fds[1], p[0][1]) == -1) goto syncdie ;
sig_blocknone() ;
mexec_aen(prog, argv, envp, modifs, m, 1) ;
-
- syncdie:
- {
- unsigned char c = errno ;
- fd_write(syncpipe[1], (char *)&c, 1) ;
- }
+ syncdie:
+ c = errno ;
+ fd_write(syncpipe[1], &c, 1) ;
_exit(127) ;
}
fd_close(syncpipe[1]) ;
+ syncpipe[1] = fd_read(syncpipe[0], &c, 1) ;
+ if (syncpipe[1])
{
- unsigned char c ;
- syncpipe[1] = fd_read(syncpipe[0], (char *)&c, 1) ;
- if (syncpipe[1])
- {
- int e = c ;
- if (syncpipe[1] < 0) e = errno ;
- if (wait_pid(pid, &syncpipe[1]) < 0) e = errno ;
- errno = e ;
- goto errsp0 ;
- }
+ int e = (unsigned char)c ;
+ if (syncpipe[1] == -1) e = errno ;
+ if (wait_pid(pid, &syncpipe[1]) == -1) e = errno ;
+ errno = e ;
+ goto errsp0 ;
}
fd_close(syncpipe[0]) ;
-#endif
fd_close(p[2][1]) ;
fd_close(p[1][0]) ;
@@ -142,21 +179,11 @@ pid_t child_spawn3 (char const *prog, char const *const *argv, char const *const
fds[2] = p[2][0] ;
return pid ;
-#ifdef SKALIBS_HASPOSIXSPAWN
- erractions:
- posix_spawn_file_actions_destroy(&actions) ;
- errattr:
- posix_spawnattr_destroy(&attr) ;
- erre:
- errno = e ;
-#endif
-#ifndef SKALIBS_HASPOSIXSPAWN
errsp:
fd_close(syncpipe[1]) ;
errsp0:
fd_close(syncpipe[0]) ;
errp2:
-#endif
fd_close(p[2][1]) ;
fd_close(p[2][0]) ;
errp1:
@@ -167,3 +194,5 @@ pid_t child_spawn3 (char const *prog, char const *const *argv, char const *const
fd_close(p[0][0]) ;
return 0 ;
}
+
+#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 21:19:45 +0000