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

unix: code cleanup, rename variable

Browse Source
This commit is contained in:
Ben Noordhuis 2012-09-12 01:33:16 +02:00
parent 12c25e1027
commit b5028c5b54
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

@ -205,26 +205,26 @@ static void uv__process_close_stream(uv_stdio_container_t* container) {
static void uv__process_child_init(uv_process_options_t options, static void uv__process_child_init(uv_process_options_t options,
int stdio_count, int stdio_count,
int* pipes) { int* pipes) {
int i; int fd;
if (options.flags & UV_PROCESS_DETACHED) { if (options.flags & UV_PROCESS_DETACHED) {
setsid(); setsid();
} }
/* Dup fds */ /* Dup fds */
for (i = 0; i < stdio_count; i++) { for (fd = 0; fd < stdio_count; fd++) {
/* /*
* stdin has swapped ends of pipe * stdin has swapped ends of pipe
* (it's the only one readable stream) * (it's the only one readable stream)
*/ */
int close_fd = i == 0 ? pipes[i * 2 + 1] : pipes[i * 2]; int close_fd = fd == 0 ? pipes[fd * 2 + 1] : pipes[fd * 2];
int use_fd = i == 0 ? pipes[i * 2] : pipes[i * 2 + 1]; int use_fd = fd == 0 ? pipes[fd * 2] : pipes[fd * 2 + 1];
if (use_fd >= 0) { if (use_fd >= 0) {
close(close_fd); close(close_fd);
} else if (i < 3) { } else if (fd < 3) {
/* `/dev/null` stdin, stdout, stderr even if they've flag UV_IGNORE */ /* `/dev/null` stdin, stdout, stderr even if they've flag UV_IGNORE */
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 < 0) { if (use_fd < 0) {
perror("failed to open stdio"); perror("failed to open stdio");
@ -234,8 +234,8 @@ static void uv__process_child_init(uv_process_options_t options,
continue; continue;
} }
if (i != use_fd) { if (fd != use_fd) {
dup2(use_fd, i); dup2(use_fd, fd);
close(use_fd); close(use_fd);
} else { } else {
uv__cloexec(use_fd, 0); uv__cloexec(use_fd, 0);