Skip to content

Commit

Permalink
Revert "Patch uv for win7 compatiblity"
Browse files Browse the repository at this point in the history
This reverts commit 85b4e67.
  • Loading branch information
branchseer committed Jun 30, 2022
1 parent 6fe5db2 commit d4eacd6
Showing 1 changed file with 0 additions and 41 deletions.
41 changes: 0 additions & 41 deletions libnode/patch/node.patch
Original file line number Diff line number Diff line change
Expand Up @@ -19,44 +19,3 @@
'src/js_native_api.h',
'src/js_native_api_types.h',
'src/node_api_types.h',
--- a/deps/uv/src/win/util.c
+++ b/deps/uv/src/win/util.c
@@ -1664,33 +1664,26 @@ int uv_os_unsetenv(const char* name) {


int uv_os_gethostname(char* buffer, size_t* size) {
- WCHAR buf[UV_MAXHOSTNAMESIZE];
+ char buf[UV_MAXHOSTNAMESIZE];
size_t len;
- char* utf8_str;
- int convert_result;

if (buffer == NULL || size == NULL || *size == 0)
return UV_EINVAL;

uv__once_init(); /* Initialize winsock */

- if (GetHostNameW(buf, UV_MAXHOSTNAMESIZE) != 0)
+ if (gethostname(buf, sizeof(buf)) != 0)
return uv_translate_sys_error(WSAGetLastError());

- convert_result = uv__convert_utf16_to_utf8(buf, -1, &utf8_str);
+ buf[sizeof(buf) - 1] = '\0'; /* Null terminate, just to be safe. */
+ len = strlen(buf);

- if (convert_result != 0)
- return convert_result;
-
- len = strlen(utf8_str);
if (len >= *size) {
*size = len + 1;
- uv__free(utf8_str);
return UV_ENOBUFS;
}

- memcpy(buffer, utf8_str, len + 1);
- uv__free(utf8_str);
+ memcpy(buffer, buf, len + 1);
*size = len;
return 0;
}

0 comments on commit d4eacd6

Please sign in to comment.