deps: update libuv to version 1.6.1
PR-URL: https://github.com/nodejs/io.js/pull/1905 Refs: https://github.com/nodejs/io.js/pull/1791 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
This commit is contained in:
Родитель
2dcef83b5f
Коммит
a5bd466440
|
@ -1,3 +1,10 @@
|
||||||
|
2015.06.06, Version 1.6.1 (Stable), 30c8be07bb78a66fdee5141626bf53a49a17094a
|
||||||
|
|
||||||
|
Changes since version 1.6.0:
|
||||||
|
|
||||||
|
* unix: handle invalid _SC_GETPW_R_SIZE_MAX values (cjihrig)
|
||||||
|
|
||||||
|
|
||||||
2015.06.04, Version 1.6.0 (Stable), adfccad76456061dfcf79b8df8e7dbfee51791d7
|
2015.06.04, Version 1.6.0 (Stable), adfccad76456061dfcf79b8df8e7dbfee51791d7
|
||||||
|
|
||||||
Changes since version 1.5.0:
|
Changes since version 1.5.0:
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
AC_PREREQ(2.57)
|
AC_PREREQ(2.57)
|
||||||
AC_INIT([libuv], [1.6.0], [https://github.com/libuv/libuv/issues])
|
AC_INIT([libuv], [1.6.1], [https://github.com/libuv/libuv/issues])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
m4_include([m4/libuv-extra-automake-flags.m4])
|
m4_include([m4/libuv-extra-automake-flags.m4])
|
||||||
m4_include([m4/as_case.m4])
|
m4_include([m4/as_case.m4])
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
#define UV_VERSION_MAJOR 1
|
#define UV_VERSION_MAJOR 1
|
||||||
#define UV_VERSION_MINOR 6
|
#define UV_VERSION_MINOR 6
|
||||||
#define UV_VERSION_PATCH 0
|
#define UV_VERSION_PATCH 1
|
||||||
#define UV_VERSION_IS_RELEASE 1
|
#define UV_VERSION_IS_RELEASE 1
|
||||||
#define UV_VERSION_SUFFIX ""
|
#define UV_VERSION_SUFFIX ""
|
||||||
|
|
||||||
|
|
|
@ -1000,6 +1000,7 @@ int uv_os_homedir(char* buffer, size_t* size) {
|
||||||
uid_t uid;
|
uid_t uid;
|
||||||
size_t bufsize;
|
size_t bufsize;
|
||||||
size_t len;
|
size_t len;
|
||||||
|
long initsize;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
if (buffer == NULL || size == NULL || *size == 0)
|
if (buffer == NULL || size == NULL || *size == 0)
|
||||||
|
@ -1023,10 +1024,12 @@ int uv_os_homedir(char* buffer, size_t* size) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* HOME is not set, so call getpwuid() */
|
/* HOME is not set, so call getpwuid() */
|
||||||
bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
|
initsize = sysconf(_SC_GETPW_R_SIZE_MAX);
|
||||||
|
|
||||||
if (bufsize <= 0)
|
if (initsize <= 0)
|
||||||
return -EIO;
|
bufsize = 4096;
|
||||||
|
else
|
||||||
|
bufsize = (size_t) initsize;
|
||||||
|
|
||||||
uid = getuid();
|
uid = getuid();
|
||||||
buf = NULL;
|
buf = NULL;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче