diff options
| -rw-r--r-- | iov.c | 11 | ||||
| -rw-r--r-- | vl.c | 5 |
2 files changed, 8 insertions, 8 deletions
diff --git a/iov.c b/iov.c index 7cc08f0fe4..b3330610bb 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 } diff --git a/vl.c b/vl.c index 1329c30e6a..2e140f57c7 100644 --- a/vl.c +++ b/vl.c @@ -1795,9 +1795,8 @@ char *qemu_find_file(int type, const char *name) const char *subdir; char *buf; - /* If name contains path separators then try it as a straight path. */ - if ((strchr(name, '/') || strchr(name, '\\')) - && access(name, R_OK) == 0) { + /* Try the name as a straight path first */ + if (access(name, R_OK) == 0) { return g_strdup(name); } switch (type) { |