diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h index b6ce8ec2e9..fa9812cd59 100644 --- a/deps/uv/include/uv.h +++ b/deps/uv/include/uv.h @@ -79,7 +79,7 @@ typedef intptr_t ssize_t; XX( 7, EAFNOSUPPORT, "") \ XX( 8, EALREADY, "") \ XX( 9, EBADF, "bad file descriptor") \ - XX( 10, EBUSY, "mount device busy") \ + XX( 10, EBUSY, "resource busy or locked") \ XX( 11, ECONNABORTED, "software caused connection abort") \ XX( 12, ECONNREFUSED, "connection refused") \ XX( 13, ECONNRESET, "connection reset by peer") \ @@ -119,7 +119,8 @@ typedef intptr_t ssize_t; XX( 49, ENAMETOOLONG, "name too long") \ XX( 50, EPERM, "operation not permitted") \ XX( 51, ELOOP, "too many symbolic links encountered") \ - XX( 52, EXDEV, "cross-device link not permitted") + XX( 52, EXDEV, "cross-device link not permitted") \ + XX( 53, ENOTEMPTY, "directory not empty") #define UV_ERRNO_GEN(val, name, s) UV_##name = val, diff --git a/deps/uv/src/unix/error.c b/deps/uv/src/unix/error.c index 93c5ac1f56..071b03affc 100644 --- a/deps/uv/src/unix/error.c +++ b/deps/uv/src/unix/error.c @@ -88,6 +88,8 @@ uv_err_code uv_translate_sys_error(int sys_errno) { case ESRCH: return UV_ESRCH; case ETIMEDOUT: return UV_ETIMEDOUT; case EXDEV: return UV_EXDEV; + case EBUSY: return UV_EBUSY; + case ENOTEMPTY: return UV_ENOTEMPTY; default: return UV_UNKNOWN; } diff --git a/deps/uv/src/win/error.c b/deps/uv/src/win/error.c index 1922f2039b..3f6615f5a5 100644 --- a/deps/uv/src/win/error.c +++ b/deps/uv/src/win/error.c @@ -78,6 +78,8 @@ uv_err_code uv_translate_sys_error(int sys_errno) { case WSAEAFNOSUPPORT: return UV_EAFNOSUPPORT; case WSAEWOULDBLOCK: return UV_EAGAIN; case WSAEALREADY: return UV_EALREADY; + case ERROR_LOCK_VIOLATION: return UV_EBUSY; + case ERROR_SHARING_VIOLATION: return UV_EBUSY; case ERROR_CONNECTION_ABORTED: return UV_ECONNABORTED; case WSAECONNABORTED: return UV_ECONNABORTED; case ERROR_CONNECTION_REFUSED: return UV_ECONNREFUSED; @@ -102,6 +104,7 @@ uv_err_code uv_translate_sys_error(int sys_errno) { case ERROR_OUTOFMEMORY: return UV_ENOMEM; case ERROR_NOT_CONNECTED: return UV_ENOTCONN; case WSAENOTCONN: return UV_ENOTCONN; + case ERROR_DIR_NOT_EMPTY: return UV_ENOTEMPTY; case ERROR_NOT_SUPPORTED: return UV_ENOTSUP; case ERROR_INSUFFICIENT_BUFFER: return UV_EINVAL; case ERROR_INVALID_FLAGS: return UV_EBADF;