From f15ceb8ced4a88f3a4c30f6b45cf52691f4c1a5f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 22 Jan 2013 10:09:55 +0100 Subject: [PATCH] ustream-fd: retry partial writes Signed-off-by: Felix Fietkau --- ustream-fd.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/ustream-fd.c b/ustream-fd.c index a47ff94..a252708 100644 --- a/ustream-fd.c +++ b/ustream-fd.c @@ -83,28 +83,33 @@ static void ustream_fd_read_pending(struct ustream_fd *sf, bool *more) static int ustream_fd_write(struct ustream *s, const char *buf, int buflen, bool more) { struct ustream_fd *sf = container_of(s, struct ustream_fd, stream); - ssize_t len; + ssize_t ret = 0, len; if (!buflen) return 0; -retry: - len = write(sf->fd.fd, buf, buflen); - if (!len) - goto retry; + while (buflen) { + len = write(sf->fd.fd, buf, buflen); - if (len < 0) { - if (errno == EINTR) - goto retry; + if (len < 0) { + if (errno == EINTR) + continue; - if (errno == EAGAIN || errno == EWOULDBLOCK) - len = 0; + if (errno == EAGAIN || errno == EWOULDBLOCK) + break; + + return -1; + } + + ret += len; + buf += len; + buflen -= len; } - if (len >= 0 && len < buflen) + if (buflen) ustream_fd_set_uloop(s, true); - return len; + return ret; } static bool __ustream_fd_poll(struct ustream_fd *sf, unsigned int events)