auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: read/write now goes through connection fn's

Browse Source 
depending on whether the connection is over a socket
or pipe, the read is done differently.

pipes can return -1 when writing 0 bytes, make 0 byte
writes a successful no-op. 0 byte writes falls out
naturally of tcl server code.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
Øyvind Harboe
2010-09-27 09:24:51 +02:00
parent 5a41435e45
commit cb2dba2c12
5 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/tcl_server.c
View File

@@ -57,7 +57,7 @@ int tcl_output(struct connection *connection, const void *data, ssize_t len)
if (tclc->tc_outerror)
return ERROR_SERVER_REMOTE_CLOSED;
wlen = write_socket(connection->fd, data, len);
wlen = connection_write(connection, data, len);
if (wlen == len)
return ERROR_OK;
@@ -92,7 +92,7 @@ static int tcl_input(struct connection *connection)
struct tcl_connection *tclc;
unsigned char in[256];
rlen = read_socket(connection->fd, &in, sizeof(in));
rlen = connection_read(connection, &in, sizeof(in));
if (rlen <= 0) {
if (rlen < 0)
LOG_ERROR("error during read: %s", strerror(errno));