projects
/
musl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd45edb
)
fix backwards posix_spawn file action order
author
Rich Felker
<dalias@aerifal.cx>
Sun, 29 May 2011 16:58:02 +0000
(12:58 -0400)
committer
Rich Felker
<dalias@aerifal.cx>
Sun, 29 May 2011 16:58:02 +0000
(12:58 -0400)
src/process/fdop.h
patch
|
blob
|
history
src/process/posix_spawn.c
patch
|
blob
|
history
src/process/posix_spawn_file_actions_addclose.c
patch
|
blob
|
history
src/process/posix_spawn_file_actions_adddup2.c
patch
|
blob
|
history
src/process/posix_spawn_file_actions_addopen.c
patch
|
blob
|
history
diff --git
a/src/process/fdop.h
b/src/process/fdop.h
index
72f9b5f
..
02ff83c
100644
(file)
--- a/
src/process/fdop.h
+++ b/
src/process/fdop.h
@@
-3,7
+3,7
@@
#define FDOP_OPEN 3
struct fdop {
#define FDOP_OPEN 3
struct fdop {
- struct fdop *next;
+ struct fdop *next
, *prev
;
int cmd, fd, newfd, oflag;
mode_t mode;
char path[];
int cmd, fd, newfd, oflag;
mode_t mode;
char path[];
diff --git
a/src/process/posix_spawn.c
b/src/process/posix_spawn.c
index
59f4a8b
..
b1a9fbd
100644
(file)
--- a/
src/process/posix_spawn.c
+++ b/
src/process/posix_spawn.c
@@
-51,10
+51,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);
diff --git
a/src/process/posix_spawn_file_actions_addclose.c
b/src/process/posix_spawn_file_actions_addclose.c
index
44c6314
..
cdda597
100644
(file)
--- a/
src/process/posix_spawn_file_actions_addclose.c
+++ b/
src/process/posix_spawn_file_actions_addclose.c
@@
-9,7
+9,8
@@
int posix_spawn_file_actions_addclose(posix_spawn_file_actions_t *fa, int fd)
if (!op) return ENOMEM;
op->cmd = FDOP_CLOSE;
op->fd = fd;
if (!op) return ENOMEM;
op->cmd = FDOP_CLOSE;
op->fd = fd;
- op->next = fa->__actions;
+ if ((op->next = fa->__actions)) op->next->prev = op;
+ op->prev = 0;
fa->__actions = op;
return 0;
}
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
index
9209ee7
..
26f2c5c
100644
(file)
--- a/
src/process/posix_spawn_file_actions_adddup2.c
+++ b/
src/process/posix_spawn_file_actions_adddup2.c
@@
-10,7
+10,8
@@
int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *fa, int fd, int
op->cmd = FDOP_DUP2;
op->fd = fd;
op->newfd = newfd;
op->cmd = FDOP_DUP2;
op->fd = fd;
op->newfd = newfd;
- op->next = fa->__actions;
+ if ((op->next = fa->__actions)) op->next->prev = op;
+ op->prev = 0;
fa->__actions = op;
return 0;
}
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
index
5e2c86d
..
af3ca60
100644
(file)
--- a/
src/process/posix_spawn_file_actions_addopen.c
+++ b/
src/process/posix_spawn_file_actions_addopen.c
@@
-13,7
+13,8
@@
int posix_spawn_file_actions_addopen(posix_spawn_file_actions_t *fa, int fd, con
op->oflag = flags;
op->mode = mode;
strcpy(op->path, path);
op->oflag = flags;
op->mode = mode;
strcpy(op->path, path);
- op->next = fa->__actions;
+ if ((op->next = fa->__actions)) op->next->prev = op;
+ op->prev = 0;
fa->__actions = op;
return 0;
}
fa->__actions = op;
return 0;
}