diff options
| author | Saúl Ibarra Corretgé <saghul@gmail.com> | 2015-09-11 17:55:29 +0200 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-09-11 18:38:43 +0200 |
| commit | 68dc69a382692f424c53b75724e684a406b195a1 (patch) | |
| tree | ae2725deaaea798d3b61e2258ad329016f0b3ddd /deps/uv/src/unix/fs.c | |
| parent | 958a94e19dd6dda962cd690a5f4aa0ad02ac21bc (diff) | |
| download | android-node-v8-68dc69a382692f424c53b75724e684a406b195a1.tar.gz android-node-v8-68dc69a382692f424c53b75724e684a406b195a1.tar.bz2 android-node-v8-68dc69a382692f424c53b75724e684a406b195a1.zip | |
deps: update libuv to version 1.7.4
PR-URL: https://github.com/nodejs/node/pull/2817
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/uv/src/unix/fs.c')
| -rw-r--r-- | deps/uv/src/unix/fs.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/deps/uv/src/unix/fs.c b/deps/uv/src/unix/fs.c index 52082e9347..d739c28258 100644 --- a/deps/uv/src/unix/fs.c +++ b/deps/uv/src/unix/fs.c @@ -574,7 +574,14 @@ static ssize_t uv__fs_sendfile(uv_fs_t* req) { r = sendfile(in_fd, out_fd, req->off, &len, NULL, 0); #endif - if (r != -1 || len != 0) { + /* + * The man page for sendfile(2) on DragonFly states that `len` contains + * a meaningful value ONLY in case of EAGAIN and EINTR. + * Nothing is said about it's value in case of other errors, so better + * not depend on the potential wrong assumption that is was not modified + * by the syscall. + */ + if (r == 0 || ((errno == EAGAIN || errno == EINTR) && len != 0)) { req->off += len; return (ssize_t) len; } |