c/libuv
1
0
Fork 0
mirror of https://github.com/libuv/libuv synced 2025-03-28 21:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

unix, windows: return error if uv_pipe_open fails

Browse Source
This commit is contained in:
Saúl Ibarra Corretgé 2012-09-13 08:45:31 +02:00 committed by Ben Noordhuis
parent 3d9de13f1b
commit c8514b0382
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uv.h
View File

@ -940,7 +940,7 @@ UV_EXTERN int uv_pipe_init(uv_loop_t*, uv_pipe_t* handle, int ipc);
/*
* Opens an existing file descriptor or HANDLE as a pipe.
*/
UV_EXTERN void uv_pipe_open(uv_pipe_t*, uv_file file);
UV_EXTERN int uv_pipe_open(uv_pipe_t*, uv_file file);
UV_EXTERN int uv_pipe_bind(uv_pipe_t* handle, const char* name);

8
src/unix/pipe.c
View File

@ -156,10 +156,10 @@ void uv__pipe_close(uv_pipe_t* handle) {
}
void uv_pipe_open(uv_pipe_t* handle, uv_file fd) {
uv__stream_open((uv_stream_t*)handle,
fd,
UV_STREAM_READABLE | UV_STREAM_WRITABLE);
int uv_pipe_open(uv_pipe_t* handle, uv_file fd) {
return uv__stream_open((uv_stream_t*)handle,
fd,
UV_STREAM_READABLE | UV_STREAM_WRITABLE);
}

6
src/win/pipe.c
View File

@ -1634,12 +1634,13 @@ static void eof_timer_close_cb(uv_handle_t* handle) {
}
void uv_pipe_open(uv_pipe_t* pipe, uv_file file) {
int uv_pipe_open(uv_pipe_t* pipe, uv_file file) {
HANDLE os_handle = (HANDLE)_get_osfhandle(file);
if (os_handle == INVALID_HANDLE_VALUE ||
uv_set_pipe_handle(pipe->loop, pipe, os_handle, 0) == -1) {
return;
uv__set_sys_error(pipe->loop, WSAEINVAL);
return -1;
}
uv_pipe_connection_init(pipe);
@ -1651,4 +1652,5 @@ void uv_pipe_open(uv_pipe_t* pipe, uv_file file) {
pipe->ipc_pid = uv_parent_pid();
assert(pipe->ipc_pid != -1);
}
return 0;
}