Archives/mblaze
2
0
Fork 0
mirror of https://github.com/leahneukirchen/mblaze synced 2024-11-07 15:20:37 +00:00
Code Issues Projects Releases Wiki Activity

filter: use a non-blocking write pipe

Browse Source
This commit is contained in:
Leah Neukirchen 2017-08-06 20:05:37 +02:00
parent 6b5b42f583
commit 13db67713f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
filter.c
View File

@ -1,5 +1,7 @@
#include <sys/wait.h>
#include <fcntl.h>
#include <errno.h>
#include <limits.h>
#include <poll.h>
#include <signal.h>
@ -34,6 +36,10 @@ filter(char *input, size_t inlen, char *cmd, char **outputo, size_t *outleno)
if (pipe(pipe0) != 0 || pipe(pipe1) != 0)
goto fail;
int got = fcntl(pipe0[1], F_GETFL);
if (got > 0)
fcntl(pipe0[1], F_SETFL, got | O_NONBLOCK);
char *argv[] = { "/bin/sh", "-c", cmd, (char *)0 };
if (!(pid = fork())) {
@ -85,13 +91,14 @@ filter(char *input, size_t inlen, char *cmd, char **outputo, size_t *outleno)
}
if (fds[1].revents & POLLOUT) {
ssize_t ret = write(fds[1].fd, input,
inlen > PIPE_BUF ? PIPE_BUF : inlen);
ssize_t ret = write(fds[1].fd, input, inlen);
if (ret > 0) {
input += ret;
inlen -= ret;
}
if (ret <= 0 || inlen == 0)
if (ret <= 0 && errno == EAGAIN) {
/* ignore */
} else if (ret <= 0 || inlen == 0)
close(fds[1].fd);
} else if (fds[1].revents & (POLLERR | POLLHUP | POLLNVAL)) {
fds[1].fd = -1;