luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unix: fix ‘fd’ undeclared build error

Browse Source 
Reapplies commit b5028c5b, failed to merge in 5cb4197.
This commit is contained in:
Ben Noordhuis 2012-10-25 12:49:30 +02:00
parent 5cb4197deb
commit 6150feda56
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/unix/process.c
View File

@ -289,24 +289,24 @@ static void uv__process_child_init(uv_process_options_t options,
int error_fd) {
int close_fd;
int use_fd;
int i;
int fd;
if (options.flags & UV_PROCESS_DETACHED)
setsid();
for (i = 0; i < stdio_count; i++) {
close_fd = pipes[i][0];
use_fd = pipes[i][1];
for (fd = 0; fd < stdio_count; fd++) {
close_fd = pipes[fd][0];
use_fd = pipes[fd][1];
if (use_fd >= 0)
close(close_fd);
else if (i >= 3)
else if (fd >= 3)
continue;
else {
/* redirect stdin, stdout and stderr to /dev/null even if UV_IGNORE is
* set
*/
use_fd = open("/dev/null", i == 0 ? O_RDONLY : O_RDWR);
use_fd = open("/dev/null", fd == 0 ? O_RDONLY : O_RDWR);
if (use_fd == -1) {
uv__write_int(error_fd, errno);
@ -315,10 +315,10 @@ static void uv__process_child_init(uv_process_options_t options,
}
}
if (i == use_fd)
if (fd == use_fd)
uv__cloexec(use_fd, 0);
else {
dup2(use_fd, i);
dup2(use_fd, fd);
close(use_fd);
}