summaryrefslogtreecommitdiff
path: root/net/nagios-base/patches/patch-lib_worker.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/nagios-base/patches/patch-lib_worker.c')
-rw-r--r--net/nagios-base/patches/patch-lib_worker.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/net/nagios-base/patches/patch-lib_worker.c b/net/nagios-base/patches/patch-lib_worker.c
index 416b4777cbe..15d7042adc1 100644
--- a/net/nagios-base/patches/patch-lib_worker.c
+++ b/net/nagios-base/patches/patch-lib_worker.c
@@ -1,9 +1,10 @@
-$NetBSD: patch-lib_worker.c,v 1.1.2.2 2016/02/08 10:12:10 bsiegert Exp $
+$NetBSD: patch-lib_worker.c,v 1.1.2.3 2016/02/13 16:25:40 bsiegert Exp $
64bit time_t workaround
+Workaround for poll(2) returning spurious POLLIN
--- lib/worker.c.orig 2014-08-12 17:00:01.000000000 +0200
-+++ lib/worker.c 2016-02-07 22:08:53.000000000 +0100
++++ lib/worker.c 2016-02-08 12:31:57.000000000 +0100
@@ -194,7 +194,7 @@
#define kvvec_add_tv(kvv, key, value) \
@@ -13,3 +14,12 @@ $NetBSD: patch-lib_worker.c,v 1.1.2.2 2016/02/08 10:12:10 bsiegert Exp $
kvvec_addkv_wlen(kvv, key, sizeof(key) - 1, buf, strlen(buf)); \
} while (0)
+@@ -439,6 +439,8 @@
+
+ rd = read(io->fd, buf, sizeof(buf));
+ if (rd < 0) {
++ if (!final && errno == EAGAIN)
++ return;
+ if (errno == EINTR || errno == EAGAIN)
+ continue;
+ if (!final && errno != EAGAIN)