mirror of
https://github.com/fluencelabs/musl
synced 2025-06-30 15:11:55 +00:00
add file actions support to posix_spawn
This commit is contained in:
@ -2,7 +2,9 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <fcntl.h>
|
||||||
#include "syscall.h"
|
#include "syscall.h"
|
||||||
|
#include "fdop.h"
|
||||||
|
|
||||||
extern char **environ;
|
extern char **environ;
|
||||||
|
|
||||||
@ -49,6 +51,32 @@ int __posix_spawnx(pid_t *res, const char *path,
|
|||||||
__syscall(SYS_setuid, __syscall(SYS_getuid)) ))
|
__syscall(SYS_setuid, __syscall(SYS_getuid)) ))
|
||||||
_exit(127);
|
_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)
|
sigprocmask(SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK)
|
||||||
? &attr->__mask : &oldmask, 0);
|
? &attr->__mask : &oldmask, 0);
|
||||||
|
|
||||||
|
15
src/process/posix_spawn_file_actions_addclose.c
Normal file
15
src/process/posix_spawn_file_actions_addclose.c
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
#include <spawn.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#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;
|
||||||
|
}
|
16
src/process/posix_spawn_file_actions_adddup2.c
Normal file
16
src/process/posix_spawn_file_actions_adddup2.c
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
#include <spawn.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#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;
|
||||||
|
}
|
19
src/process/posix_spawn_file_actions_addopen.c
Normal file
19
src/process/posix_spawn_file_actions_addopen.c
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
#include <spawn.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#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;
|
||||||
|
}
|
@ -1,9 +1,14 @@
|
|||||||
#include <spawn.h>
|
#include <spawn.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include "fdop.h"
|
||||||
|
|
||||||
int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t *fa)
|
int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t *fa)
|
||||||
{
|
{
|
||||||
// FIXME
|
struct fdop *op = fa->__actions, *next;
|
||||||
free(fa->__actions);
|
while (op) {
|
||||||
|
next = op->next;
|
||||||
|
free(op);
|
||||||
|
op = next;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user