X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fprocess%2Fposix_spawn.c;h=b1a9fbde52c9aafc8fe8a8725bc4439b3018a311;hb=d40e344f7b311980dfe3c165d8cbecfe04c12bd2;hp=e718cee30c2af9b4d3e0d8527f2bcff868ed4662;hpb=c97f0d998cae23472ea30564663a8612dcfb6f83;p=musl

diff --git a/src/process/posix_spawn.c b/src/process/posix_spawn.c
index e718cee3..b1a9fbde 100644
--- a/src/process/posix_spawn.c
+++ b/src/process/posix_spawn.c
@@ -2,7 +2,9 @@
 #include <unistd.h>
 #include <signal.h>
 #include <stdint.h>
+#include <fcntl.h>
 #include "syscall.h"
+#include "fdop.h"
 
 extern char **environ;
 
@@ -31,7 +33,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,6 +51,33 @@ 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);