aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

net_receive(), net_transmit(): error handling was buggy

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@980 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-12-08 20:13:21 +00:00 committed by cras
parent d3e9880f48
commit e6cc73bd4b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/network.c
View File

@ -286,7 +286,7 @@ int net_receive(GIOChannel *handle, char *buf, int len)
if (err == 0 && ret == 0) if (err == 0 && ret == 0)
return -1; /* disconnected */ return -1; /* disconnected */
if (err == G_IO_ERROR_AGAIN || errno == EINTR) if (err == G_IO_ERROR_AGAIN || (err != 0 && errno == EINTR))
return 0; /* no bytes received */ return 0; /* no bytes received */
return err == 0 ? ret : -1; return err == 0 ? ret : -1;
@ -301,7 +301,8 @@ int net_transmit(GIOChannel *handle, const char *data, int len)
g_return_val_if_fail(data != NULL, -1); g_return_val_if_fail(data != NULL, -1);
err = g_io_channel_write(handle, (char *) data, len, &ret); err = g_io_channel_write(handle, (char *) data, len, &ret);
if (err == G_IO_ERROR_AGAIN || errno == EINTR || errno == EPIPE) if (err == G_IO_ERROR_AGAIN || (err != 0 && errno == EINTR ||
errno == EPIPE))
return 0; return 0;
return err == 0 ? ret : -1; return err == 0 ? ret : -1;