[Patch v5 1/4] transport-helper: use xread instead of read
- From
- randall.s.becker@rogers.com <randall.s.becker@rogers.com>
- Date
- Jan 3, 2019, 21:03 UTC
- Message-ID
- <20190103210351.13920-2-randall.s.becker@rogers.com>
- In-Reply-To
- <20190103210351.13920-1-randall.s.becker@rogers.com>
From: "Randall S. Becker" <randall.becker@nexbridge.ca>
This fix was needed on HPE NonStop NSE and NSX where SSIZE_MAX is less than BUFFERSIZE resulting in EINVAL. The call to read in transport-helper.c was the only place outside of wrapper.c where it is used instead of xread.
Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> --- transport-helper.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c index bf225c698..5afead9f8 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1225,9 +1225,8 @@ static int udt_do_read(struct unidirectional_transfer *t) return 0; /* No space for more. */ transfer_debug("%s is readable", t->src_name); - bytes = read(t->src, t->buf + t->bufuse, BUFFERSIZE - t->bufuse); - if (bytes < 0 && errno != EWOULDBLOCK && errno != EAGAIN && - errno != EINTR) { + bytes = xread(t->src, t->buf + t->bufuse, BUFFERSIZE - t->bufuse); + if (bytes < 0 && errno != EINTR) { error_errno(_("read(%s) failed"), t->src_name); return -1; } else if (bytes == 0) {
-- 2.12.3