diff --git a/src/process/posix_spawn.c b/src/process/posix_spawn.c index 7018c37ef6e6a6bfb391f2f1c3b26004625a4544..59f4a8bba2479b8749ccb69e0345f8bceecccc4b 100644 --- a/src/process/posix_spawn.c +++ b/src/process/posix_spawn.c @@ -2,7 +2,9 @@ #include #include #include +#include #include "syscall.h" +#include "fdop.h" extern char **environ; @@ -49,6 +51,32 @@ int __posix_spawnx(pid_t *res, const char *path, __syscall(SYS_setuid, __syscall(SYS_getuid)) )) _exit(127); + if (fa) { + struct fdop *op; + int ret, fd; + for (op = fa->__actions; op; op = op->next) { + 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); diff --git a/src/process/posix_spawn_file_actions_addclose.c b/src/process/posix_spawn_file_actions_addclose.c new file mode 100644 index 0000000000000000000000000000000000000000..44c6314fcb69090da8b4dbec1336318dd692ff39 --- /dev/null +++ b/src/process/posix_spawn_file_actions_addclose.c @@ -0,0 +1,15 @@ +#include +#include +#include +#include "fdop.h" + +int posix_spawn_file_actions_addclose(posix_spawn_file_actions_t *fa, int fd) +{ + struct fdop *op = malloc(sizeof *op); + if (!op) return ENOMEM; + op->cmd = FDOP_CLOSE; + op->fd = fd; + op->next = fa->__actions; + fa->__actions = op; + return 0; +} diff --git a/src/process/posix_spawn_file_actions_adddup2.c b/src/process/posix_spawn_file_actions_adddup2.c new file mode 100644 index 0000000000000000000000000000000000000000..9209ee7c2e84fa78460db6a9cc7cd541c43ab3bf --- /dev/null +++ b/src/process/posix_spawn_file_actions_adddup2.c @@ -0,0 +1,16 @@ +#include +#include +#include +#include "fdop.h" + +int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *fa, int fd, int newfd) +{ + struct fdop *op = malloc(sizeof *op); + if (!op) return ENOMEM; + op->cmd = FDOP_DUP2; + op->fd = fd; + op->newfd = newfd; + op->next = fa->__actions; + fa->__actions = op; + return 0; +} diff --git a/src/process/posix_spawn_file_actions_addopen.c b/src/process/posix_spawn_file_actions_addopen.c new file mode 100644 index 0000000000000000000000000000000000000000..5e2c86d9b12e93da3472be052cce0b1b6bd57a9c --- /dev/null +++ b/src/process/posix_spawn_file_actions_addopen.c @@ -0,0 +1,19 @@ +#include +#include +#include +#include +#include "fdop.h" + +int posix_spawn_file_actions_addopen(posix_spawn_file_actions_t *fa, int fd, const char *path, int flags, mode_t mode) +{ + struct fdop *op = malloc(sizeof *op + strlen(path) + 1); + if (!op) return ENOMEM; + op->cmd = FDOP_OPEN; + op->fd = fd; + op->oflag = flags; + op->mode = mode; + strcpy(op->path, path); + op->next = fa->__actions; + fa->__actions = op; + return 0; +} diff --git a/src/process/posix_spawn_file_actions_destroy.c b/src/process/posix_spawn_file_actions_destroy.c index c2501ddfaf60a6941812b09e702c6c06f4bb7298..3251babb556cae7cd6c81986b286ee7705e8285b 100644 --- a/src/process/posix_spawn_file_actions_destroy.c +++ b/src/process/posix_spawn_file_actions_destroy.c @@ -1,9 +1,14 @@ #include #include +#include "fdop.h" int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t *fa) { - // FIXME - free(fa->__actions); + struct fdop *op = fa->__actions, *next; + while (op) { + next = op->next; + free(op); + op = next; + } return 0; }