diff --git a/src/uev.c b/src/uev.c index 1a110c9..ca757bc 100644 --- a/src/uev.c +++ b/src/uev.c @@ -344,8 +344,11 @@ int uev_run(uev_ctx_t *ctx, int flags) } } - if (rerun) + if (rerun) { + if (flags & UEV_ONCE) + break; continue; + } ctx->workaround = 0; while ((nfds = epoll_wait(ctx->fd, ee, maxevents, timeout)) < 0) { diff --git a/test/.gitignore b/test/.gitignore index a3e8823..99ad772 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -6,5 +6,6 @@ complete cronrun io signal +stdin timer event diff --git a/test/Makefile.am b/test/Makefile.am index 8db6210..a389f6e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -11,6 +11,7 @@ TESTS += complete TESTS += cronrun TESTS += io TESTS += signal +TESTS += stdin TESTS += timer TESTS += event diff --git a/test/stdin.c b/test/stdin.c new file mode 100644 index 0000000..376b727 --- /dev/null +++ b/test/stdin.c @@ -0,0 +1,44 @@ +/* Verifies UEV_ONCE with stdin redirected from a regular file */ +#include "check.h" + +static int calls; + +static void cb(uev_t *w, void *arg, int events) +{ + char ch; + + calls++; + read(w->fd, &ch, 1); +} + +int main(void) +{ + FILE *fp = tmpfile(); + uev_ctx_t ctx; + uev_t w; + + fail_unless(fp != NULL); + fail_unless(fputs("abc", fp) >= 0); + rewind(fp); + fail_unless(dup2(fileno(fp), STDIN_FILENO) == STDIN_FILENO); + + fail_unless(uev_init(&ctx) == 0); + fail_unless(uev_io_init(&ctx, &w, cb, NULL, STDIN_FILENO, UEV_READ) == 0); + + alarm(5); + fail_unless(uev_run(&ctx, UEV_ONCE) == 0); + fail_unless(calls == 1); + + /* Without UEV_ONCE the rest is drained, including EOF */ + fail_unless(uev_run(&ctx, 0) == 0); + fail_unless(calls == 4); + + return uev_exit(&ctx); +} + +/** + * Local Variables: + * indent-tabs-mode: t + * c-file-style: "linux" + * End: + */