From 93c11990d215c678d254a56a7b3bc63e3a53e0de Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 11 Mar 2017 00:57:09 +0000 Subject: compat_sendfile: ensure this works without an offset While we never call sendfile without an offset, some projects may copy our code and want to use it without an offset. --- compat_sendfile.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compat_sendfile.h b/compat_sendfile.h index 8413891..c1cc9e4 100644 --- a/compat_sendfile.h +++ b/compat_sendfile.h @@ -12,14 +12,15 @@ static ssize_t compat_sendfile(int sockfd, int filefd, off_t *off, size_t count) max_pread = MIN(max_pread, count); do { - r = pread(filefd, buf, max_pread, *off); + r = off ? pread(filefd, buf, max_pread, *off) : + read(filefd, buf, max_pread); } while (r < 0 && errno == EINTR); if (r <= 0) return r; w = write(sockfd, buf, r); - if (w > 0) + if (w > 0 && off) *off += w; return w; } -- cgit v1.2.3-24-ge0c7