diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-19 00:49:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-19 00:49:54 +0300 |
| commit | 9f2eba2b90d7af573e1a86c6974db4fe33acbfe1 (patch) | |
| tree | 64c43292005b34ada96172f1f47ccb7dc5549bd8 /transport-helper.c | |
| parent | e805dc189218a6e7b4a735c90ec687a4ca174a85 (diff) | |
| parent | 0bdaacf66fccaebb93726d47c8bec325ec3f3b76 (diff) | |
Merge branch 'rb/hpe'
Portability updates for the HPE NonStop platform.
* rb/hpe:
compat/regex/regcomp.c: define intptr_t and uintptr_t on NonStop
git-compat-util.h: add FLOSS headers for HPE NonStop
config.mak.uname: support for modern HPE NonStop config.
transport-helper: drop read/write errno checks
transport-helper: use xread instead of read
Diffstat (limited to 'transport-helper.c')
| -rw-r--r-- | transport-helper.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/transport-helper.c b/transport-helper.c index 4702e150f0..6cf3bb324e 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1226,9 +1226,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) { error_errno(_("read(%s) failed"), t->src_name); return -1; } else if (bytes == 0) { @@ -1255,7 +1254,7 @@ static int udt_do_write(struct unidirectional_transfer *t) transfer_debug("%s is writable", t->dest_name); bytes = xwrite(t->dest, t->buf, t->bufuse); - if (bytes < 0 && errno != EWOULDBLOCK) { + if (bytes < 0) { error_errno(_("write(%s) failed"), t->dest_name); return -1; } else if (bytes > 0) { |