GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More robust error checking.

Browse Source
This commit is contained in:
Vincent Richard 2013-12-17 22:04:36 +01:00
parent 5f63d47401
commit 73eded2f97
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/platforms/posix/posixSocket.cpp
View File

@ -46,9 +46,9 @@
#if defined(EWOULDBLOCK) #if defined(EWOULDBLOCK)
# define IS_EAGAIN(x) ((x) == EAGAIN || (x) == EWOULDBLOCK || (x) == EINTR) # define IS_EAGAIN(x) ((x) == EAGAIN || (x) == EWOULDBLOCK || (x) == EINTR || (x) == EINPROGRESS)
#else #else
# define IS_EAGAIN(x) ((x) == EAGAIN || (x) == EINTR) # define IS_EAGAIN(x) ((x) == EAGAIN || (x) == EINTR || (x) == EINPROGRESS)
#endif #endif
@ -551,9 +551,9 @@ void posixSocket::sendRaw(const byte_t* buffer, const size_t count)
{ {
const ssize_t ret = ::send(m_desc, buffer, size, 0); const ssize_t ret = ::send(m_desc, buffer, size, 0);
if (ret < 0) if (ret <= 0)
{ {
if (!IS_EAGAIN(errno)) if (ret < 0 && !IS_EAGAIN(errno))
throwSocketError(errno); throwSocketError(errno);
platform::getHandler()->wait(); platform::getHandler()->wait();
@ -577,9 +577,9 @@ size_t posixSocket::sendRawNonBlocking(const byte_t* buffer, const size_t count)
const ssize_t ret = ::send(m_desc, buffer, count, 0); const ssize_t ret = ::send(m_desc, buffer, count, 0);
if (ret < 0) if (ret <= 0)
{ {
if (!IS_EAGAIN(errno)) if (ret < 0 && !IS_EAGAIN(errno))
throwSocketError(errno); throwSocketError(errno);
m_status |= STATUS_WOULDBLOCK; m_status |= STATUS_WOULDBLOCK;