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.
*/

2
src/exec_monitor.c
View File

@@ -492,7 +492,7 @@ exec_monitor(struct command_details *details, bool foreground, int backchannel)
* We use a pipe to atomically handle signal notification within
* the event loop.
*/
if (pipe_nonblock(signal_pipe) != 0)
if (pipe2(signal_pipe, O_NONBLOCK) != 0)
sudo_fatal(U_("unable to create pipe"));
/* Reset SIGWINCH and SIGALRM. */

3
src/signal.c
View File

@@ -27,6 +27,7 @@
#endif /* HAVE_STRINGS_H */
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
#include "sudo.h"
@@ -125,7 +126,7 @@ init_signals(void)
* We use a pipe to atomically handle signal notification within
* the select() loop without races (we may not have pselect()).
*/
if (pipe_nonblock(signal_pipe) != 0)
if (pipe2(signal_pipe, O_NONBLOCK) != 0)
sudo_fatal(U_("unable to create pipe"));
memset(&sa, 0, sizeof(sa));

1
src/sudo.h
View File

@@ -195,7 +195,6 @@ char *tgetpass(const char *prompt, int timeout, int flags,
struct sudo_conv_callback *callback);
/* exec.c */
int pipe_nonblock(int fds[2]);
int sudo_execute(struct command_details *details, struct command_status *cstat);
/* parse_args.c */