diff options
Diffstat (limited to 'src/process/posix_spawn.c')
| -rw-r--r-- | src/process/posix_spawn.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/process/posix_spawn.c b/src/process/posix_spawn.c index 93fb1555..16308fb7 100644 --- a/src/process/posix_spawn.c +++ b/src/process/posix_spawn.c @@ -14,7 +14,6 @@ struct args { int p[2]; sigset_t oldmask; const char *path; - int (*exec)(const char *, char *const *, char *const *); const posix_spawn_file_actions_t *fa; const posix_spawnattr_t *restrict attr; char *const *argv, *const *envp; @@ -138,7 +137,10 @@ static int child(void *args_vp) pthread_sigmask(SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK) ? &attr->__mask : &args->oldmask, 0); - args->exec(args->path, args->argv, args->envp); + int (*exec)(const char *, char *const *, char *const *) = + attr->__fn ? (int (*)())attr->__fn : execve; + + exec(args->path, args->argv, args->envp); ret = -errno; fail: @@ -149,8 +151,7 @@ fail: } -int __posix_spawnx(pid_t *restrict res, const char *restrict path, - int (*exec)(const char *, char *const *, char *const *), +int posix_spawn(pid_t *restrict res, const char *restrict path, const posix_spawn_file_actions_t *fa, const posix_spawnattr_t *restrict attr, char *const argv[restrict], char *const envp[restrict]) @@ -166,7 +167,6 @@ int __posix_spawnx(pid_t *restrict res, const char *restrict path, pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); args.path = path; - args.exec = exec; args.fa = fa; args.attr = attr ? attr : &(const posix_spawnattr_t){0}; args.argv = argv; @@ -193,11 +193,3 @@ int __posix_spawnx(pid_t *restrict res, const char *restrict path, return ec; } - -int posix_spawn(pid_t *restrict res, const char *restrict path, - const posix_spawn_file_actions_t *fa, - const posix_spawnattr_t *restrict attr, - char *const argv[restrict], char *const envp[restrict]) -{ - return __posix_spawnx(res, path, execve, fa, attr, argv, envp); -} |