isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace pipe_nonblock() with pipe2()

Browse Source
This commit is contained in:
Todd C. Miller
2017-03-13 12:11:52 -06:00
parent 7aa89c49b5
commit 35e4bd3e9f
4 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/exec.c
View File

@@ -256,35 +256,6 @@ sudo_execute(struct command_details *details, struct command_status *cstat)
debug_return_int(cstat->type == CMD_ERRNO ? -1 : 0);
}
/*
* Open a pipe and make both ends non-blocking.
* Returns 0 on success and -1 on error.
*/
int
pipe_nonblock(int fds[2])
{
int flags, ret;
debug_decl(pipe_nonblock, SUDO_DEBUG_EXEC)
ret = pipe(fds);
if (ret != -1) {
flags = fcntl(fds[0], F_GETFL, 0);
if (flags != -1 && !ISSET(flags, O_NONBLOCK))
ret = fcntl(fds[0], F_SETFL, flags | O_NONBLOCK);
if (ret != -1) {
flags = fcntl(fds[1], F_GETFL, 0);
if (flags != -1 && !ISSET(flags, O_NONBLOCK))
ret = fcntl(fds[1], F_SETFL, flags | O_NONBLOCK);
}
if (ret == -1) {
close(fds[0]);
close(fds[1]);
}
}
debug_return_int(ret);
}
/*
* Kill command with increasing urgency.
*/