mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
34 lines
983 B
Diff
34 lines
983 B
Diff
From f69bf0fb95f8db126ffcffe5c1a59a955d778a3e Mon Sep 17 00:00:00 2001
|
|
From: Natanael Copa <ncopa@alpinelinux.org>
|
|
Date: Mon, 2 Jan 2017 14:39:27 +0000
|
|
Subject: [PATCH 12/14] use posix strerror_r unless gnu
|
|
|
|
---
|
|
open-vm-tools/lib/err/errPosix.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/open-vm-tools/lib/err/errPosix.c b/open-vm-tools/lib/err/errPosix.c
|
|
index 37b45237..63ca9dd7 100644
|
|
--- a/open-vm-tools/lib/err/errPosix.c
|
|
+++ b/open-vm-tools/lib/err/errPosix.c
|
|
@@ -63,11 +63,13 @@ ErrErrno2String(Err_Number errorNumber, // IN
|
|
{
|
|
char *p;
|
|
|
|
-#if defined(linux) && !defined(N_PLAT_NLM) && !defined(__ANDROID__)
|
|
+#if defined(__GLIBC__)
|
|
p = strerror_r(errorNumber, buf, bufSize);
|
|
#else
|
|
- p = strerror(errorNumber);
|
|
-#endif
|
|
+ if (strerror_r(errorNumber, buf, bufSize) != 0)
|
|
+ snprintf(buf, bufSize, "unknown error %i", errorNumber);
|
|
+ p = buf;
|
|
+#endif /* defined __GLIBC__ */
|
|
ASSERT(p != NULL);
|
|
return p;
|
|
}
|
|
--
|
|
2.11.0
|
|
|