- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / atomicio.c

diff --git a/atomicio.c b/atomicio.c
index de5363aa3a95d8a0a3bb34f3c563134abf5beccd..a6b2d127a9b803a8e4e1c85359d351eaaabecaf9 100644 (file)
--- a/atomicio.c
+++ b/atomicio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atomicio.c,v 1.18 2006/04/16 00:52:55 djm Exp $ */
+/* $OpenBSD: atomicio.c,v 1.25 2007/06/25 12:02:27 dtucker Exp $ */
 /*
  * Copyright (c) 2006 Damien Miller. All rights reserved.
  * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
@@ -28,6 +28,20 @@
 
 #include "includes.h"
 
+#include <sys/param.h>
+#include <sys/uio.h>
+
+#include <errno.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#else
+# ifdef HAVE_SYS_POLL_H
+#  include <sys/poll.h>
+# endif
+#endif
+#include <string.h>
+#include <unistd.h>
+
 #include "atomicio.h"
 
 /*
@@ -39,17 +53,20 @@ atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n)
        char *s = _s;
        size_t pos = 0;
        ssize_t res;
+       struct pollfd pfd;
 
+       pfd.fd = fd;
+       pfd.events = f == read ? POLLIN : POLLOUT;
        while (n > pos) {
                res = (f) (fd, s + pos, n - pos);
                switch (res) {
                case -1:
-#ifdef EWOULDBLOCK
-                       if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
-#else
-                       if (errno == EINTR || errno == EAGAIN)
-#endif
+                       if (errno == EINTR)
                                continue;
+                       if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                               (void)poll(&pfd, 1, -1);
+                               continue;
+                       }
                        return 0;
                case 0:
                        errno = EPIPE;
@@ -71,6 +88,7 @@ atomiciov(ssize_t (*f) (int, const struct iovec *, int), int fd,
        size_t pos = 0, rem;
        ssize_t res;
        struct iovec iov_array[IOV_MAX], *iov = iov_array;
+       struct pollfd pfd;
 
        if (iovcnt > IOV_MAX) {
                errno = EINVAL;
@@ -79,12 +97,22 @@ atomiciov(ssize_t (*f) (int, const struct iovec *, int), int fd,
        /* Make a copy of the iov array because we may modify it below */
        memcpy(iov, _iov, iovcnt * sizeof(*_iov));
 
+#ifndef BROKEN_READV_COMPARISON
+       pfd.fd = fd;
+       pfd.events = f == readv ? POLLIN : POLLOUT;
+#endif
        for (; iovcnt > 0 && iov[0].iov_len > 0;) {
                res = (f) (fd, iov, iovcnt);
                switch (res) {
                case -1:
-                       if (errno == EINTR || errno == EAGAIN)
+                       if (errno == EINTR)
                                continue;
+                       if (errno == EAGAIN || errno == EWOULDBLOCK) {
+#ifndef BROKEN_READV_COMPARISON
+                               (void)poll(&pfd, 1, -1);
+#endif
+                               continue;
+                       }
                        return 0;
                case 0:
                        errno = EPIPE;
@@ -99,7 +127,7 @@ atomiciov(ssize_t (*f) (int, const struct iovec *, int), int fd,
                                iovcnt--;
                        }
                        /* This shouldn't happen... */
-                       if (rem > iov[0].iov_len || (rem > 0 && iovcnt <= 0)) {
+                       if (rem > 0 && (iovcnt <= 0 || rem > iov[0].iov_len)) {
                                errno = EFAULT;
                                return 0;
                        }