gre-ilya/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v0.10'

Browse Source 
Conflicts:
	AUTHORS
	ChangeLog
	include/uv.h
	src/unix/error.c
	src/unix/process.c
	src/version.c
This commit is contained in:
Fedor Indutny 2014-03-06 20:45:15 +04:00
commit 9aa48312bc
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -124,3 +124,4 @@ William Light <wrl@illest.net>
Oleg Efimov <o.efimov@corp.badoo.com> Oleg Efimov <o.efimov@corp.badoo.com>
Lars Gierth <larsg@systemli.org> Lars Gierth <larsg@systemli.org>
rcp <zerhacken@yahoo.com> rcp <zerhacken@yahoo.com>
Alexis Campailla <alexis@janeasystems.com>

8
ChangeLog
View File

@ -90,6 +90,14 @@ Changes since version 0.11.18:
* linux: fix C99/C++ comment (Fedor Indutny) * linux: fix C99/C++ comment (Fedor Indutny)
2014.02.19, Version 0.10.25 (Stable), d778dc588507588b12b9f9d2905078db542ed751
Changes since version 0.10.24:
* stream: start thread after assignments (Oguz Bastemur)
* unix: correct error when calling uv_shutdown twice (Saúl Ibarra Corretgé)
2014.01.30, Version 0.10.24 (Stable), aecd296b6bce9b40f06a61c5c94e43d45ac7308a 2014.01.30, Version 0.10.24 (Stable), aecd296b6bce9b40f06a61c5c94e43d45ac7308a
Changes since version 0.10.23: Changes since version 0.10.23:

6
include/uv-errno.h
View File

@ -394,4 +394,10 @@
# define UV__ERANGE (-4034) # define UV__ERANGE (-4034)
#endif #endif
#if defined(ENXIO) && !defined(_WIN32)
# define UV__ENXIO (-ENXIO)
#else
# define UV__ENXIO (-4033)
#endif
#endif /* UV_ERRNO_H_ */ #endif /* UV_ERRNO_H_ */

1
include/uv.h
View File

@ -137,6 +137,7 @@ extern "C" {
XX(EXDEV, "cross-device link not permitted") \ XX(EXDEV, "cross-device link not permitted") \
XX(UNKNOWN, "unknown error") \ XX(UNKNOWN, "unknown error") \
XX(EOF, "end of file") \ XX(EOF, "end of file") \
XX(ENXIO, "no such device or address") \
#define UV_HANDLE_TYPE_MAP(XX) \ #define UV_HANDLE_TYPE_MAP(XX) \
XX(ASYNC, async) \ XX(ASYNC, async) \

7
src/unix/process.c
View File

@ -302,8 +302,7 @@ static void uv__process_child_init(const uv_process_options_t* options,
close_fd = use_fd; close_fd = use_fd;
if (use_fd == -1) { if (use_fd == -1) {
uv__write_int(error_fd, -errno); uv__write_int(error_fd, -errno);
perror("failed to open stdio");
_exit(127); _exit(127);
} }
} }
@ -330,7 +329,6 @@ static void uv__process_child_init(const uv_process_options_t* options,
if (options->cwd != NULL && chdir(options->cwd)) { if (options->cwd != NULL && chdir(options->cwd)) {
uv__write_int(error_fd, -errno); uv__write_int(error_fd, -errno);
perror("chdir()");
_exit(127); _exit(127);
} }
@ -347,13 +345,11 @@ static void uv__process_child_init(const uv_process_options_t* options,
if ((options->flags & UV_PROCESS_SETGID) && setgid(options->gid)) { if ((options->flags & UV_PROCESS_SETGID) && setgid(options->gid)) {
uv__write_int(error_fd, -errno); uv__write_int(error_fd, -errno);
perror("setgid()");
_exit(127); _exit(127);
} }
if ((options->flags & UV_PROCESS_SETUID) && setuid(options->uid)) { if ((options->flags & UV_PROCESS_SETUID) && setuid(options->uid)) {
uv__write_int(error_fd, -errno); uv__write_int(error_fd, -errno);
perror("setuid()");
_exit(127); _exit(127);
} }
@ -363,7 +359,6 @@ static void uv__process_child_init(const uv_process_options_t* options,
execvp(options->file, options->args); execvp(options->file, options->args);
uv__write_int(error_fd, -errno); uv__write_int(error_fd, -errno);
perror("execvp()");
_exit(127); _exit(127);
} }