fix various errors in function signatures/prototypes found by nsz

[musl] / src / process / posix_spawn.c

diff --git a/src/process/posix_spawn.c b/src/process/posix_spawn.c
index e718cee..9f2d742 100644 (file)
--- a/src/process/posix_spawn.c
+++ b/src/process/posix_spawn.c
@@ -2,14 +2,17 @@
 #include <unistd.h>
 #include <signal.h>
 #include <stdint.h>
+#include <fcntl.h>
 #include "syscall.h"
+#include "fdop.h"
 
 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;
@@ -31,7 +34,9 @@ int __posix_spawnx(pid_t *res, const char *path,
        for (i=1; i<=64; i++) {
                struct sigaction sa;
                sigaction(i, 0, &sa);
-               if (sa.sa_handler!=SIG_IGN || sigismember(&attr->__def, i)) {
+               if (sa.sa_handler!=SIG_IGN ||
+                   ((attr->__flags & POSIX_SPAWN_SETSIGDEF)
+                    && sigismember(&attr->__def, i) )) {
                        sa.sa_handler = SIG_DFL;
                        sigaction(i, &sa, 0);
                }
@@ -47,10 +52,37 @@ int __posix_spawnx(pid_t *res, const char *path,
                __syscall(SYS_setuid, __syscall(SYS_getuid)) ))
                _exit(127);
 
+       if (fa && fa->__actions) {
+               struct fdop *op;
+               int ret, fd;
+               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);
+                               break;
+                       case FDOP_DUP2:
+                               ret = __syscall(SYS_dup2, op->fd, op->newfd)<0;
+                               break;
+                       case FDOP_OPEN:
+                               fd = __syscall(SYS_open, op->path,
+                                       op->oflag | O_LARGEFILE, op->mode);
+                               if (fd == op->fd) {
+                                       ret = 0;
+                               } else {
+                                       ret = __syscall(SYS_dup2, fd, op->fd)<0;
+                                       __syscall(SYS_close, fd);
+                               }
+                               break;
+                       }
+                       if (ret) _exit(127);
+               }
+       }
+
        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);
 
@@ -59,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);
 }