|
@@ -160,14 +160,14 @@ static int pipe_waitforclient (PAL_HANDLE handle, PAL_HANDLE * client)
|
|
|
|
|
|
PAL_HANDLE clnt = malloc(HANDLE_SIZE(pipeprv));
|
|
PAL_HANDLE clnt = malloc(HANDLE_SIZE(pipeprv));
|
|
SET_HANDLE_TYPE(clnt, pipeprv);
|
|
SET_HANDLE_TYPE(clnt, pipeprv);
|
|
- clnt->__in.flags |= RFD(0)|WFD(1)|WRITEABLE(1);
|
|
|
|
|
|
+ clnt->__in.flags |= RFD(0)|WFD(1)|WRITABLE(1);
|
|
clnt->pipeprv.fds[0] = pipes[0];
|
|
clnt->pipeprv.fds[0] = pipes[0];
|
|
clnt->pipeprv.fds[1] = pipes[1];
|
|
clnt->pipeprv.fds[1] = pipes[1];
|
|
*client = clnt;
|
|
*client = clnt;
|
|
#else
|
|
#else
|
|
PAL_HANDLE clnt = malloc(HANDLE_SIZE(pipe));
|
|
PAL_HANDLE clnt = malloc(HANDLE_SIZE(pipe));
|
|
SET_HANDLE_TYPE(clnt, pipecli);
|
|
SET_HANDLE_TYPE(clnt, pipecli);
|
|
- HANDLE_HDR(clnt)->flags |= RFD(0)|WFD(0)|WRITEABLE(0);
|
|
|
|
|
|
+ HANDLE_HDR(clnt)->flags |= RFD(0)|WFD(0)|WRITABLE(0);
|
|
clnt->pipe.fd = newfd;
|
|
clnt->pipe.fd = newfd;
|
|
clnt->pipe.pipeid = handle->pipe.pipeid;
|
|
clnt->pipe.pipeid = handle->pipe.pipeid;
|
|
clnt->pipe.nonblocking = PAL_FALSE;
|
|
clnt->pipe.nonblocking = PAL_FALSE;
|
|
@@ -252,7 +252,7 @@ static int pipe_connect (PAL_HANDLE * handle, PAL_NUM pipeid, int options)
|
|
|
|
|
|
PAL_HANDLE hdl = malloc(HANDLE_SIZE(pipeprv));
|
|
PAL_HANDLE hdl = malloc(HANDLE_SIZE(pipeprv));
|
|
SET_HANDLE_TYPE(hdl, pipeprv);
|
|
SET_HANDLE_TYPE(hdl, pipeprv);
|
|
- HANDLE_HDR(hdl)->flags |= RFD(0)|WFD(1)|WRITEABLE(1);
|
|
|
|
|
|
+ HANDLE_HDR(hdl)->flags |= RFD(0)|WFD(1)|WRITABLE(1);
|
|
hdl->pipeprv.fds[0] = pipes[0];
|
|
hdl->pipeprv.fds[0] = pipes[0];
|
|
hdl->pipeprv.fds[1] = pipes[1];
|
|
hdl->pipeprv.fds[1] = pipes[1];
|
|
hdl->pipeprv.nonblocking = (options & PAL_OPTION_NONBLOCK) ?
|
|
hdl->pipeprv.nonblocking = (options & PAL_OPTION_NONBLOCK) ?
|
|
@@ -260,7 +260,7 @@ static int pipe_connect (PAL_HANDLE * handle, PAL_NUM pipeid, int options)
|
|
#else
|
|
#else
|
|
PAL_HANDLE hdl = malloc(HANDLE_SIZE(pipe));
|
|
PAL_HANDLE hdl = malloc(HANDLE_SIZE(pipe));
|
|
SET_HANDLE_TYPE(hdl, pipe);
|
|
SET_HANDLE_TYPE(hdl, pipe);
|
|
- HANDLE_HDR(hdl)->flags |= RFD(0)|WFD(0)|WRITEABLE(0);
|
|
|
|
|
|
+ HANDLE_HDR(hdl)->flags |= RFD(0)|WFD(0)|WRITABLE(0);
|
|
hdl->pipe.fd = fd;
|
|
hdl->pipe.fd = fd;
|
|
hdl->pipe.pipeid = pipeid;
|
|
hdl->pipe.pipeid = pipeid;
|
|
hdl->pipe.nonblocking = (options & PAL_OPTION_NONBLOCK) ?
|
|
hdl->pipe.nonblocking = (options & PAL_OPTION_NONBLOCK) ?
|
|
@@ -286,7 +286,7 @@ static int pipe_private (PAL_HANDLE * handle, int options)
|
|
|
|
|
|
PAL_HANDLE hdl = malloc(HANDLE_SIZE(pipeprv));
|
|
PAL_HANDLE hdl = malloc(HANDLE_SIZE(pipeprv));
|
|
SET_HANDLE_TYPE(hdl, pipeprv);
|
|
SET_HANDLE_TYPE(hdl, pipeprv);
|
|
- HANDLE_HDR(hdl)->flags |= RFD(0)|WFD(1)|WRITEABLE(1);
|
|
|
|
|
|
+ HANDLE_HDR(hdl)->flags |= RFD(0)|WFD(1)|WRITABLE(1);
|
|
hdl->pipeprv.fds[0] = fds[0];
|
|
hdl->pipeprv.fds[0] = fds[0];
|
|
hdl->pipeprv.fds[1] = fds[1];
|
|
hdl->pipeprv.fds[1] = fds[1];
|
|
hdl->pipeprv.nonblocking = (options & PAL_OPTION_NONBLOCK) ?
|
|
hdl->pipeprv.nonblocking = (options & PAL_OPTION_NONBLOCK) ?
|
|
@@ -421,13 +421,13 @@ static int64_t pipe_write (PAL_HANDLE handle, uint64_t offset, size_t len,
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
- PAL_FLG writeable = IS_HANDLE_TYPE(handle, pipeprv) ? WRITEABLE(1) :
|
|
|
|
- WRITEABLE(0);
|
|
|
|
|
|
+ PAL_FLG writable = IS_HANDLE_TYPE(handle, pipeprv) ? WRITABLE(1) :
|
|
|
|
+ WRITABLE(0);
|
|
|
|
|
|
if (!IS_ERR(bytes) && (size_t)bytes == len)
|
|
if (!IS_ERR(bytes) && (size_t)bytes == len)
|
|
- HANDLE_HDR(handle)->flags |= writeable;
|
|
|
|
|
|
+ HANDLE_HDR(handle)->flags |= writable;
|
|
else
|
|
else
|
|
- HANDLE_HDR(handle)->flags &= ~writeable;
|
|
|
|
|
|
+ HANDLE_HDR(handle)->flags &= ~writable;
|
|
|
|
|
|
if (IS_ERR(bytes))
|
|
if (IS_ERR(bytes))
|
|
bytes = unix_to_pal_error(ERRNO(bytes));
|
|
bytes = unix_to_pal_error(ERRNO(bytes));
|
|
@@ -532,15 +532,15 @@ static int pipe_attrquerybyhdl (PAL_HANDLE handle, PAL_STREAM_ATTR * attr)
|
|
return unix_to_pal_error(ERRNO(ret));
|
|
return unix_to_pal_error(ERRNO(ret));
|
|
}
|
|
}
|
|
attr->pending_size = val;
|
|
attr->pending_size = val;
|
|
- attr->writeable = HANDLE_HDR(handle)->flags & (
|
|
|
|
- IS_HANDLE_TYPE(handle, pipeprv) ? WRITEABLE(1) : WRITEABLE(0));
|
|
|
|
|
|
+ attr->writable = HANDLE_HDR(handle)->flags & (
|
|
|
|
+ IS_HANDLE_TYPE(handle, pipeprv) ? WRITABLE(1) : WRITABLE(0));
|
|
} else {
|
|
} else {
|
|
struct pollfd pfd = { .fd = handle->generic.fds[0], .events = POLLIN, .revents = 0 };
|
|
struct pollfd pfd = { .fd = handle->generic.fds[0], .events = POLLIN, .revents = 0 };
|
|
struct timespec tp = { 0, 0 };
|
|
struct timespec tp = { 0, 0 };
|
|
ret = INLINE_SYSCALL(ppoll, 5, &pfd, 1, &tp, NULL, 0);
|
|
ret = INLINE_SYSCALL(ppoll, 5, &pfd, 1, &tp, NULL, 0);
|
|
attr->readable = (ret == 1 && pfd.revents == POLLIN);
|
|
attr->readable = (ret == 1 && pfd.revents == POLLIN);
|
|
attr->pending_size = 0;
|
|
attr->pending_size = 0;
|
|
- attr->writeable = PAL_FALSE;
|
|
|
|
|
|
+ attr->writable = PAL_FALSE;
|
|
}
|
|
}
|
|
|
|
|
|
struct pollfd pfd = { .fd = handle->generic.fds[0], .events = POLLIN, .revents = 0 };
|
|
struct pollfd pfd = { .fd = handle->generic.fds[0], .events = POLLIN, .revents = 0 };
|