0a1
> /* $OpenBSD: atomicio.c,v 1.23 2006/08/03 03:34:41 deraadt Exp $ */
1a3
> * Copyright (c) 2006 Damien Miller. All rights reserved.
28d29
< RCSID("$OpenBSD: atomicio.c,v 1.13 2005/05/24 17:32:43 avsm Exp $");
29a31,36
> #include <sys/param.h>
> #include <sys/uio.h>
>
> #include <errno.h>
> #include <string.h>
>
36,40c43
< atomicio(f, fd, _s, n)
< ssize_t (*f) (int, void *, size_t);
< int fd;
< void *_s;
< size_t n;
---
> atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n)
61c64
< pos += (u_int)res;
---
> pos += (size_t)res;
65a69,120
>
> /*
> * ensure all of data on socket comes through. f==readv || f==writev
> */
> size_t
> atomiciov(ssize_t (*f) (int, const struct iovec *, int), int fd,
> const struct iovec *_iov, int iovcnt)
> {
> size_t pos = 0, rem;
> ssize_t res;
> struct iovec iov_array[IOV_MAX], *iov = iov_array;
>
> if (iovcnt > IOV_MAX) {
> errno = EINVAL;
> return 0;
> }
> /* Make a copy of the iov array because we may modify it below */
> memcpy(iov, _iov, iovcnt * sizeof(*_iov));
>
> for (; iovcnt > 0 && iov[0].iov_len > 0;) {
> res = (f) (fd, iov, iovcnt);
> switch (res) {
> case -1:
> if (errno == EINTR || errno == EAGAIN)
> continue;
> return 0;
> case 0:
> errno = EPIPE;
> return pos;
> default:
> rem = (size_t)res;
> pos += rem;
> /* skip completed iov entries */
> while (iovcnt > 0 && rem >= iov[0].iov_len) {
> rem -= iov[0].iov_len;
> iov++;
> iovcnt--;
> }
> /* This shouldn't happen... */
> if (rem > 0 && (iovcnt <= 0 || rem > iov[0].iov_len)) {
> errno = EFAULT;
> return 0;
> }
> if (iovcnt == 0)
> break;
> /* update pointer in partially complete iov */
> iov[0].iov_base = ((char *)iov[0].iov_base) + rem;
> iov[0].iov_len -= rem;
> }
> }
> return pos;
> }