From f5bbd3b657b6340551c8a95f74a70857ff8fac79 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 30 Jan 2014 11:26:46 +1100 Subject: - (djm) [configure.ac atomicio.c] Kludge around NetBSD offering different symbols for 'read' when various compiler flags are in use, causing atomicio.c comparisons against it to break and read/write operations to hang; ok dtucker --- atomicio.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'atomicio.c') diff --git a/atomicio.c b/atomicio.c index 601b3c37..2bac36c9 100644 --- a/atomicio.c +++ b/atomicio.c @@ -56,8 +56,10 @@ atomicio6(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n, ssize_t res; struct pollfd pfd; +#ifndef BROKEN_READ_COMPARISON pfd.fd = fd; pfd.events = f == read ? POLLIN : POLLOUT; +#endif while (n > pos) { res = (f) (fd, s + pos, n - pos); switch (res) { @@ -65,7 +67,9 @@ atomicio6(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n, if (errno == EINTR) continue; if (errno == EAGAIN || errno == EWOULDBLOCK) { +#ifndef BROKEN_READ_COMPARISON (void)poll(&pfd, 1, -1); +#endif continue; } return 0; -- cgit v1.2.3