Browse Source

update libuv to 9a5c1bad90

v0.8.7-release
Igor Zinkovsky 13 years ago
parent
commit
70a393ea9a
  1. 8
      deps/uv/src/win/fs.c
  2. 1
      deps/uv/src/win/util.c

8
deps/uv/src/win/fs.c

@ -294,6 +294,7 @@ void fs__read(uv_fs_t* req, uv_file file, void *buf, size_t length,
OVERLAPPED overlapped, *overlapped_ptr; OVERLAPPED overlapped, *overlapped_ptr;
LARGE_INTEGER offset_; LARGE_INTEGER offset_;
DWORD bytes; DWORD bytes;
DWORD error;
VERIFY_UV_FILE(file, req); VERIFY_UV_FILE(file, req);
@ -323,7 +324,12 @@ void fs__read(uv_fs_t* req, uv_file file, void *buf, size_t length,
if (ReadFile(handle, buf, length, &bytes, overlapped_ptr)) { if (ReadFile(handle, buf, length, &bytes, overlapped_ptr)) {
SET_REQ_RESULT(req, bytes); SET_REQ_RESULT(req, bytes);
} else { } else {
SET_REQ_WIN32_ERROR(req, GetLastError()); error = GetLastError();
if (error == ERROR_HANDLE_EOF) {
SET_REQ_RESULT(req, bytes);
} else {
SET_REQ_WIN32_ERROR(req, error);
}
} }
} }

1
deps/uv/src/win/util.c

@ -253,6 +253,7 @@ void uv_filetime_to_time_t(FILETIME* file_time, time_t* stat_time) {
time.tm_hour = system_time.wHour; time.tm_hour = system_time.wHour;
time.tm_min = system_time.wMinute; time.tm_min = system_time.wMinute;
time.tm_sec = system_time.wSecond; time.tm_sec = system_time.wSecond;
time.tm_isdst = -1;
*stat_time = mktime(&time); *stat_time = mktime(&time);
} else { } else {

Loading…
Cancel
Save