mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2026-04-25 05:22:04 +00:00
Add a portable strerror*() wrapper, llvm::sys::StrError(). This includes the
Windows variant, strerror_s, but I couldn't test that. I'll update configure and config.h.in in a subsequent patch. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74621 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
+2
-26
@@ -20,6 +20,7 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "llvm/Config/config.h" // Get autoconf configuration settings
|
||||
#include "llvm/System/Errno.h"
|
||||
#include <cstdlib>
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
@@ -77,34 +78,9 @@ static inline bool MakeErrMsg(
|
||||
std::string* ErrMsg, const std::string& prefix, int errnum = -1) {
|
||||
if (!ErrMsg)
|
||||
return true;
|
||||
char buffer[MAXPATHLEN];
|
||||
buffer[0] = 0;
|
||||
char* str = buffer;
|
||||
if (errnum == -1)
|
||||
errnum = errno;
|
||||
#ifdef HAVE_STRERROR_R
|
||||
// strerror_r is thread-safe.
|
||||
if (errnum)
|
||||
# if defined(__GLIBC__) && defined(_GNU_SOURCE)
|
||||
// glibc defines its own incompatible version of strerror_r
|
||||
// which may not use the buffer supplied.
|
||||
str = strerror_r(errnum,buffer,MAXPATHLEN-1);
|
||||
# else
|
||||
strerror_r(errnum,buffer,MAXPATHLEN-1);
|
||||
# endif
|
||||
#elif HAVE_STRERROR
|
||||
// Copy the thread un-safe result of strerror into
|
||||
// the buffer as fast as possible to minimize impact
|
||||
// of collision of strerror in multiple threads.
|
||||
if (errnum)
|
||||
strncpy(buffer,strerror(errnum),MAXPATHLEN-1);
|
||||
buffer[MAXPATHLEN-1] = 0;
|
||||
#else
|
||||
// Strange that this system doesn't even have strerror
|
||||
// but, oh well, just use a generic message
|
||||
sprintf(buffer, "Error #%d", errnum);
|
||||
#endif
|
||||
*ErrMsg = prefix + ": " + str;
|
||||
*ErrMsg = prefix + ": " + llvm::sys::StrError(errnum);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user