- size_t pos = stream->data_size % BACKLOG_SIZE;
- stream->data_size += bytes;
-
- if (pos + bytes > BACKLOG_SIZE) {
- size_t to_copy = BACKLOG_SIZE - pos;
- memcpy(stream->data + pos, data, to_copy);
- data += to_copy;
- bytes -= to_copy;
+ size_t pos = stream->bytes_received % stream->backlog_size;
+ stream->bytes_received += bytes;
+
+ if (pos + bytes > stream->backlog_size) {
+ ssize_t to_copy = stream->backlog_size - pos;
+ while (to_copy > 0) {
+ int ret = pwrite(stream->data_fd, data, to_copy, pos);
+ if (ret == -1 && errno == EINTR) {
+ continue;
+ }
+ if (ret == -1) {
+ perror("pwrite");
+ // Dazed and confused, but trying to continue...
+ break;
+ }
+ pos += ret;
+ data += ret;
+ to_copy -= ret;
+ bytes -= ret;
+ }