diff options
Diffstat (limited to 'atomicio.c')
-rw-r--r-- | atomicio.c | 55 |
1 files changed, 54 insertions, 1 deletions
diff --git a/atomicio.c b/atomicio.c index 996beff2f..de5363aa3 100644 --- a/atomicio.c +++ b/atomicio.c | |||
@@ -1,5 +1,6 @@ | |||
1 | /* $OpenBSD: atomicio.c,v 1.17 2006/04/01 05:51:34 djm Exp $ */ | 1 | /* $OpenBSD: atomicio.c,v 1.18 2006/04/16 00:52:55 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2006 Damien Miller. All rights reserved. | ||
3 | * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. | 4 | * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. |
4 | * Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. | 5 | * Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. |
5 | * All rights reserved. | 6 | * All rights reserved. |
@@ -59,3 +60,55 @@ atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n) | |||
59 | } | 60 | } |
60 | return (pos); | 61 | return (pos); |
61 | } | 62 | } |
63 | |||
64 | /* | ||
65 | * ensure all of data on socket comes through. f==readv || f==writev | ||
66 | */ | ||
67 | size_t | ||
68 | atomiciov(ssize_t (*f) (int, const struct iovec *, int), int fd, | ||
69 | const struct iovec *_iov, int iovcnt) | ||
70 | { | ||
71 | size_t pos = 0, rem; | ||
72 | ssize_t res; | ||
73 | struct iovec iov_array[IOV_MAX], *iov = iov_array; | ||
74 | |||
75 | if (iovcnt > IOV_MAX) { | ||
76 | errno = EINVAL; | ||
77 | return 0; | ||
78 | } | ||
79 | /* Make a copy of the iov array because we may modify it below */ | ||
80 | memcpy(iov, _iov, iovcnt * sizeof(*_iov)); | ||
81 | |||
82 | for (; iovcnt > 0 && iov[0].iov_len > 0;) { | ||
83 | res = (f) (fd, iov, iovcnt); | ||
84 | switch (res) { | ||
85 | case -1: | ||
86 | if (errno == EINTR || errno == EAGAIN) | ||
87 | continue; | ||
88 | return 0; | ||
89 | case 0: | ||
90 | errno = EPIPE; | ||
91 | return pos; | ||
92 | default: | ||
93 | rem = (size_t)res; | ||
94 | pos += rem; | ||
95 | /* skip completed iov entries */ | ||
96 | while (iovcnt > 0 && rem >= iov[0].iov_len) { | ||
97 | rem -= iov[0].iov_len; | ||
98 | iov++; | ||
99 | iovcnt--; | ||
100 | } | ||
101 | /* This shouldn't happen... */ | ||
102 | if (rem > iov[0].iov_len || (rem > 0 && iovcnt <= 0)) { | ||
103 | errno = EFAULT; | ||
104 | return 0; | ||
105 | } | ||
106 | if (iovcnt == 0) | ||
107 | break; | ||
108 | /* update pointer in partially complete iov */ | ||
109 | iov[0].iov_base = ((char *)iov[0].iov_base) + rem; | ||
110 | iov[0].iov_len -= rem; | ||
111 | } | ||
112 | } | ||
113 | return pos; | ||
114 | } | ||