From: Eric Wong <e@80x24.org>
To: cmogstored-public@bogomips.org
Subject: [PATCH] compat_sendfile: ensure this works without an offset
Date: Sat, 11 Mar 2017 00:57:09 +0000 [thread overview]
Message-ID: <20170311005709.12605-1-e@80x24.org> (raw)
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;
}
--
EW
reply other threads:[~2017-03-11 0:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/cmogstored/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170311005709.12605-1-e@80x24.org \
--to=e@80x24.org \
--cc=cmogstored-public@bogomips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/cmogstored.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).