| Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 1 | From e415152b51eacab8705b6b3274cc0d1a274772e0 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 30 Aug 2022 19:54:35 -0700 |
| 4 | Subject: [PATCH] libtrace: Use XSI version of strerror_r on non glibc systems |
| 5 | |
| 6 | The version used is glibc specific therefore make it so |
| 7 | and provide a fallback for non-glibc systems |
| 8 | |
| 9 | Upstream-Status: Submitted [https://github.com/mchehab/rasdaemon/pull/70] |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | libtrace/event-parse.c | 6 ++++++ |
| 13 | 1 file changed, 6 insertions(+) |
| 14 | |
| 15 | diff --git a/libtrace/event-parse.c b/libtrace/event-parse.c |
| 16 | index 6c705c3..6b651d5 100644 |
| 17 | --- a/libtrace/event-parse.c |
| 18 | +++ b/libtrace/event-parse.c |
| 19 | @@ -5071,7 +5071,13 @@ int pevent_strerror(struct pevent *pevent, enum pevent_errno errnum, |
| 20 | const char *msg; |
| 21 | |
| 22 | if (errnum >= 0) { |
| 23 | +#if defined(__GLIBC__) |
| 24 | msg = strerror_r(errnum, buf, buflen); |
| 25 | +#else |
| 26 | + if (strerror_r(errnum, buf, buflen) != 0) |
| 27 | + snprintf(buf, buflen, "unknown error %i", errnum); |
| 28 | + msg = buf; |
| 29 | +#endif |
| 30 | if (msg != buf) { |
| 31 | size_t len = strlen(msg); |
| 32 | memcpy(buf, msg, min(buflen - 1, len)); |
| 33 | -- |
| 34 | 2.37.3 |
| 35 | |