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

Issue #138: more reliable detection of strerror_r() variant.

Browse Source
This commit is contained in:
Vincent Richard 2017-05-08 21:46:00 +02:00
parent d2b3f98ba1
commit 8d3ea37b55
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/vmime/platforms/posix/posixSocket.cpp
View File

@ -59,6 +59,32 @@
#endif #endif
// Workaround for detection of strerror_r variants
#if VMIME_HAVE_STRERROR_R
namespace
{
char* vmime_strerror_r_result(int /* res */, char* buf)
{
// XSI-compliant prototype:
// int strerror_r(int errnum, char *buf, size_t buflen);
return buf;
}
char* vmime_strerror_r_result(char* res, char* /* buf */)
{
// GNU-specific prototype:
// char *strerror_r(int errnum, char *buf, size_t buflen);
return res;
}
}
#endif // VMIME_HAVE_STRERROR_R
namespace vmime { namespace vmime {
namespace platforms { namespace platforms {
namespace posix { namespace posix {
@ -872,20 +898,7 @@ void posixSocket::throwSocketError(const int err)
#if VMIME_HAVE_STRERROR_R #if VMIME_HAVE_STRERROR_R
char errbuf[512]; char errbuf[512];
throw exceptions::socket_exception(vmime_strerror_r_result(strerror_r(err, errbuf, sizeof(errbuf)), errbuf));
#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE
// XSI-compliant strerror_r()
strerror_r(err, errbuf, sizeof(errbuf));
throw exceptions::socket_exception(errbuf);
#else
// GNU-specific strerror_r()
const std::string strmsg(strerror_r(err, errbuf, sizeof(errbuf)));
throw exceptions::socket_exception(strmsg);
#endif
#else // !VMIME_HAVE_STRERROR_R #else // !VMIME_HAVE_STRERROR_R