misc/adsb-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apparently programs expect their stdin to be blocking

Browse Source
This commit is contained in:
Ian Gulliver
2016-03-10 21:42:58 -08:00
parent c5f117dce5
commit 521cc806fb
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
adsbus/exec.c
View File

@@ -127,6 +127,9 @@ static void exec_parent(struct exec *exec, pid_t child, int data_fd, int log_fd)
exec->child = child; exec->child = child;
LOG(exec->id, "Child started as process %d", exec->child); LOG(exec->id, "Child started as process %d", exec->child);
assert(!fcntl(data_fd, F_SETFL, O_NONBLOCK));
assert(!fcntl(log_fd, F_SETFL, O_NONBLOCK));
exec->log_peer.fd = log_fd; exec->log_peer.fd = log_fd;
exec->log_peer.event_handler = exec_log_handler; exec->log_peer.event_handler = exec_log_handler;
peer_epoll_add(&exec->log_peer, EPOLLIN); peer_epoll_add(&exec->log_peer, EPOLLIN);
@@ -167,8 +170,8 @@ static void __attribute__ ((noreturn)) exec_child(const struct exec *exec, int d
static void exec_spawn(struct exec *exec) { static void exec_spawn(struct exec *exec) {
LOG(exec->id, "Executing: %s", exec->command); LOG(exec->id, "Executing: %s", exec->command);
int data_fds[2], log_fds[2]; int data_fds[2], log_fds[2];
assert(!socketpair(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, data_fds)); assert(!socketpair(AF_UNIX, SOCK_STREAM, 0, data_fds));
assert(!socketpair(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, log_fds)); assert(!socketpair(AF_UNIX, SOCK_STREAM, 0, log_fds));
assert(!fcntl(data_fds[0], F_SETFD, FD_CLOEXEC)); assert(!fcntl(data_fds[0], F_SETFD, FD_CLOEXEC));
assert(!fcntl(log_fds[0], F_SETFD, FD_CLOEXEC)); assert(!fcntl(log_fds[0], F_SETFD, FD_CLOEXEC));