X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.cpp;h=e8d65db1a8cfda924226ad1838d087ad01a176a9;hp=b8604012f628fcce938e5861908af82436e1e0d6;hb=8a9906c6d1223019c6e91a2d152dc2b2710db821;hpb=58d50f2d9710403ea7bddf0fb290a90777c8dd68

diff --git a/stream.cpp b/stream.cpp
index b860401..e8d65db 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -1,9 +1,10 @@
 #include <assert.h>
 #include <errno.h>
+#include <limits.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <sys/types.h>
 #include <string>
 #include <vector>
 
@@ -129,7 +130,8 @@ void Stream::put_client_to_sleep(Client *client)
 vector<iovec> collect_iovecs(const vector<iovec> &data, size_t bytes_wanted)
 {
 	vector<iovec> ret;
-	for (size_t i = 0; i < data.size() && bytes_wanted > 0; ++i) {
+	size_t max_iovecs = std::min<size_t>(data.size(), IOV_MAX);
+	for (size_t i = 0; i < max_iovecs && bytes_wanted > 0; ++i) {
 		if (data[i].iov_len <= bytes_wanted) {
 			// Consume the entire iovec.
 			ret.push_back(data[i]);
@@ -185,7 +187,7 @@ void Stream::add_data_raw(const vector<iovec> &orig_data)
 		} while (ret == -1 && errno == EINTR);
 
 		if (ret == -1) {
-			log_perror("pwrite");
+			log_perror("pwritev");
 			// Dazed and confused, but trying to continue...
 			return;
 		}