X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fprocess%2Fposix_spawn.c;h=9f2d7423530c5faa034f9b179176ccd60ba3bef2;hb=a5d6199d091aad750b1fc325240a141a88ee770e;hp=59f4a8bba2479b8749ccb69e0345f8bceecccc4b;hpb=a0ae0b09368e6dbfa82860187dcd6fdf86d86fee;p=musl diff --git a/src/process/posix_spawn.c b/src/process/posix_spawn.c index 59f4a8bb..9f2d7423 100644 --- a/src/process/posix_spawn.c +++ b/src/process/posix_spawn.c @@ -11,7 +11,8 @@ extern char **environ; int __posix_spawnx(pid_t *res, const char *path, int (*exec)(const char *, char *const *), const posix_spawn_file_actions_t *fa, - const posix_spawnattr_t *attr, char **argv, char **envp) + const posix_spawnattr_t *attr, + char *const argv[], char *const envp[]) { pid_t pid; sigset_t oldmask; @@ -51,10 +52,11 @@ int __posix_spawnx(pid_t *res, const char *path, __syscall(SYS_setuid, __syscall(SYS_getuid)) )) _exit(127); - if (fa) { + if (fa && fa->__actions) { struct fdop *op; int ret, fd; - for (op = fa->__actions; op; op = op->next) { + for (op = fa->__actions; op->next; op = op->next); + for (; op; op = op->prev) { switch(op->cmd) { case FDOP_CLOSE: ret = __syscall(SYS_close, op->fd); @@ -80,7 +82,7 @@ int __posix_spawnx(pid_t *res, const char *path, sigprocmask(SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK) ? &attr->__mask : &oldmask, 0); - if (envp) environ = envp; + if (envp) environ = (char **)envp; exec(path, argv); _exit(127); @@ -89,7 +91,8 @@ int __posix_spawnx(pid_t *res, const char *path, int posix_spawn(pid_t *res, const char *path, const posix_spawn_file_actions_t *fa, - const posix_spawnattr_t *attr, char **argv, char **envp) + const posix_spawnattr_t *attr, + char *const argv[], char *const envp[]) { return __posix_spawnx(res, path, execv, fa, attr, argv, envp); }