From c0958559b1a589a0d189c45ea1adaa6b345f4256 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 11 Jul 2012 07:09:05 +0200 Subject: [PATCH] iov: Fix do_send_recv() for MinGW (also fixes a build breakage) Commit 25e5e4c7 broke compilation for non POSIX hosts (e.g. MinGW) because it partially replaced "ret" by "count". It also changed the handling of EINTR in a wrong way. The patch restores the old code for these two changes. Signed-off-by: Stefan Weil Signed-off-by: Anthony Liguori --- iov.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/iov.c b/iov.c index 7cc08f0fe..b3330610b 100644 --- a/iov.c +++ b/iov.c @@ -114,9 +114,9 @@ do_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt, bool do_send) #else /* else send piece-by-piece */ /*XXX Note: windows has WSASend() and WSARecv() */ - unsigned i; - size_t count = 0; - for (i = 0; i < iov_cnt; ++i) { + unsigned i = 0; + ssize_t ret = 0; + while (i < iov_cnt) { ssize_t r = do_send ? send(sockfd, iov[i].iov_base, iov[i].iov_len, 0) : recv(sockfd, iov[i].iov_base, iov[i].iov_len, 0); @@ -130,12 +130,13 @@ do_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt, bool do_send) /* else it is some "other" error, * only return if there was no data processed. */ if (ret == 0) { - return -1; + ret = -1; } break; } + i++; } - return count; + return ret; #endif } -- 2.39.5