projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix getaddrinfo to accept port 0 (zero)
[musl]
/
src
/
process
/
posix_spawn.c
diff --git
a/src/process/posix_spawn.c
b/src/process/posix_spawn.c
index
59f4a8b
..
604756e
100644
(file)
--- a/
src/process/posix_spawn.c
+++ b/
src/process/posix_spawn.c
@@
-8,10
+8,13
@@
extern char **environ;
extern char **environ;
-int __posix_spawnx(pid_t *res, const char *path,
+pid_t __vfork(void);
+
+int __posix_spawnx(pid_t *restrict res, const char *restrict path,
int (*exec)(const char *, char *const *),
const posix_spawn_file_actions_t *fa,
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 *restrict attr,
+ char *const argv[restrict], char *const envp[restrict])
{
pid_t pid;
sigset_t oldmask;
{
pid_t pid;
sigset_t oldmask;
@@
-21,7
+24,7
@@
int __posix_spawnx(pid_t *res, const char *path,
if (!attr) attr = &dummy_attr;
sigprocmask(SIG_BLOCK, (void *)(uint64_t []){-1}, &oldmask);
if (!attr) attr = &dummy_attr;
sigprocmask(SIG_BLOCK, (void *)(uint64_t []){-1}, &oldmask);
- pid = __
syscall(SYS_fork
);
+ pid = __
vfork(
);
if (pid) {
sigprocmask(SIG_SETMASK, &oldmask, 0);
if (pid) {
sigprocmask(SIG_SETMASK, &oldmask, 0);
@@
-51,10
+54,11
@@
int __posix_spawnx(pid_t *res, const char *path,
__syscall(SYS_setuid, __syscall(SYS_getuid)) ))
_exit(127);
__syscall(SYS_setuid, __syscall(SYS_getuid)) ))
_exit(127);
- if (fa) {
+ if (fa
&& fa->__actions
) {
struct fdop *op;
int ret, fd;
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);
switch(op->cmd) {
case FDOP_CLOSE:
ret = __syscall(SYS_close, op->fd);
@@
-80,16
+84,17
@@
int __posix_spawnx(pid_t *res, const char *path,
sigprocmask(SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK)
? &attr->__mask : &oldmask, 0);
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);
return 0;
}
exec(path, argv);
_exit(127);
return 0;
}
-int posix_spawn(pid_t *res
, const char *
path,
+int posix_spawn(pid_t *res
trict res, const char *restrict
path,
const posix_spawn_file_actions_t *fa,
const posix_spawn_file_actions_t *fa,
- const posix_spawnattr_t *attr, char **argv, char **envp)
+ const posix_spawnattr_t *restrict attr,
+ char *const argv[restrict], char *const envp[restrict])
{
return __posix_spawnx(res, path, execv, fa, attr, argv, envp);
}
{
return __posix_spawnx(res, path, execv, fa, attr, argv, envp);
}