diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/iov.c | 2 | ||||
| -rw-r--r-- | util/osdep.c | 43 |
2 files changed, 44 insertions, 1 deletions
diff --git a/util/iov.c b/util/iov.c index d32226d644..78bbbe12d0 100644 --- a/util/iov.c +++ b/util/iov.c @@ -99,7 +99,7 @@ size_t iov_size(const struct iovec *iov, const unsigned int iov_cnt) static ssize_t do_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt, bool do_send) { -#if defined CONFIG_IOVEC && defined CONFIG_POSIX +#ifdef CONFIG_POSIX ssize_t ret; struct msghdr msg; memset(&msg, 0, sizeof(msg)); diff --git a/util/osdep.c b/util/osdep.c index 6ae5aaf781..685c8ae889 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -429,3 +429,46 @@ int socket_init(void) #endif return 0; } + +#ifndef CONFIG_IOVEC +/* helper function for iov_send_recv() */ +static ssize_t +readv_writev(int fd, const struct iovec *iov, int iov_cnt, bool do_write) +{ + unsigned i = 0; + ssize_t ret = 0; + while (i < iov_cnt) { + ssize_t r = do_write + ? write(fd, iov[i].iov_base, iov[i].iov_len) + : read(fd, iov[i].iov_base, iov[i].iov_len); + if (r > 0) { + ret += r; + } else if (!r) { + break; + } else if (errno == EINTR) { + continue; + } else { + /* else it is some "other" error, + * only return if there was no data processed. */ + if (ret == 0) { + ret = -1; + } + break; + } + i++; + } + return ret; +} + +ssize_t +readv(int fd, const struct iovec *iov, int iov_cnt) +{ + return readv_writev(fd, iov, iov_cnt, false); +} + +ssize_t +writev(int fd, const struct iovec *iov, int iov_cnt) +{ + return readv_writev(fd, iov, iov_cnt, true); +} +#endif |