kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore_con: fix _ecore_con_server_flush on Windows. 

@fix
This commit is contained in:
Guillaume Friloux 2015-01-30 11:21:03 +01:00 committed by Cedric BAIL
parent 7d4f95171c
commit e57c1d396e
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/lib/ecore_con/ecore_con.c
View File

@ -2461,19 +2461,49 @@ _ecore_con_server_flush(Ecore_Con_Server *obj)
}
if (svr->ecs_state || (!(svr->type & ECORE_CON_SSL)))
#ifdef _WIN32
count = send(svr->fd, (const char *)buf + *buf_offset, num, 0);
#else
count = write(svr->fd, buf + *buf_offset, num);
#endif
else
count = ecore_con_ssl_server_write(obj, buf + *buf_offset, num);
#ifdef _WIN32
if (count == SOCKET_ERROR)
{
switch (WSAGetLastError())
{
case WSAEINTR:
case WSAEINPROGRESS:
case WSAEWOULDBLOCK:
break;
default:
{
LPTSTR s;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_FROM_STRING,
NULL, WSAGetLastError(), (DWORD)NULL, s, 0, NULL);
ecore_con_event_server_error(svr, (char *)s);
free(s);
_ecore_con_server_kill(svr);
}
}
}
#else
if (count < 0)
{
if ((errno != EAGAIN) && (errno != EINTR))
{
ecore_con_event_server_error(obj, strerror(errno));
_ecore_con_server_kill(obj);
}
return;
if ((errno != EAGAIN) && (errno != EINTR))
{
ecore_con_event_server_error(svr, strerror(errno));
_ecore_con_server_kill(svr);
}
return;
}
#endif
if (count && (!svr->ecs_state)) ecore_con_event_server_write(obj, count);