diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-01-03 07:28:27 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-01-03 07:29:56 +0000 |
commit | b4080b3b32c933f2321e7b631fa648e0900eb5c5 (patch) | |
tree | 516021d757b70c4d7ef31d193a64cc5971514a2c /main/open-vm-tools/0012-use-posix-strerror_r-unless-gnu.patch | |
parent | 26ff2ca6f000c272317886778f7e1bcb7084b0f8 (diff) | |
download | aports-b4080b3b32c933f2321e7b631fa648e0900eb5c5.tar.bz2 aports-b4080b3b32c933f2321e7b631fa648e0900eb5c5.tar.xz |
main/open-vm-tools: fix the strerror_r patch
Diffstat (limited to 'main/open-vm-tools/0012-use-posix-strerror_r-unless-gnu.patch')
-rw-r--r-- | main/open-vm-tools/0012-use-posix-strerror_r-unless-gnu.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/main/open-vm-tools/0012-use-posix-strerror_r-unless-gnu.patch b/main/open-vm-tools/0012-use-posix-strerror_r-unless-gnu.patch index 93d74cfb51..4d3319f08e 100644 --- a/main/open-vm-tools/0012-use-posix-strerror_r-unless-gnu.patch +++ b/main/open-vm-tools/0012-use-posix-strerror_r-unless-gnu.patch @@ -1,17 +1,17 @@ -From 2d207751bdc8d5b8d391604c31730909e8e271a4 Mon Sep 17 00:00:00 2001 +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 | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) + 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..dd86fe90 100644 +index 37b45237..63ca9dd7 100644 --- a/open-vm-tools/lib/err/errPosix.c +++ b/open-vm-tools/lib/err/errPosix.c -@@ -63,11 +63,12 @@ ErrErrno2String(Err_Number errorNumber, // IN +@@ -63,11 +63,13 @@ ErrErrno2String(Err_Number errorNumber, // IN { char *p; @@ -23,6 +23,7 @@ index 37b45237..dd86fe90 100644 -#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; |