44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From f66b5c802ce0a3310f5580cfc1b02446f8087568 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Mon, 23 Jan 2023 23:39:46 -0800
|
|
Subject: [PATCH] errno-util: Make STRERROR portable for musl
|
|
|
|
Sadly, systemd has decided to use yet another GNU extention in a macro
|
|
lets make this such that we can use XSI compliant strerror_r() for
|
|
non-glibc hosts
|
|
|
|
Upstream-Status: Inappropriate [musl specific]
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
src/basic/errno-util.h | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h
|
|
index 091f99c590..eb5c1f9961 100644
|
|
--- a/src/basic/errno-util.h
|
|
+++ b/src/basic/errno-util.h
|
|
@@ -14,8 +14,16 @@
|
|
* https://stackoverflow.com/questions/34880638/compound-literal-lifetime-and-if-blocks
|
|
*
|
|
* Note that we use the GNU variant of strerror_r() here. */
|
|
-#define STRERROR(errnum) strerror_r(abs(errnum), (char[ERRNO_BUF_LEN]){}, ERRNO_BUF_LEN)
|
|
-
|
|
+static inline const char * STRERROR(int errnum);
|
|
+
|
|
+static inline const char * STRERROR(int errnum) {
|
|
+#ifdef __GLIBC__
|
|
+ return strerror_r(abs(errnum), (char[ERRNO_BUF_LEN]){}, ERRNO_BUF_LEN);
|
|
+#else
|
|
+ static __thread char buf[ERRNO_BUF_LEN];
|
|
+ return strerror_r(abs(errnum), buf, ERRNO_BUF_LEN) ? "unknown error" : buf;
|
|
+#endif
|
|
+}
|
|
/* A helper to print an error message or message for functions that return 0 on EOF.
|
|
* Note that we can't use ({ … }) to define a temporary variable, so errnum is
|
|
* evaluated twice. */
|
|
--
|
|
2.39.1
|
|
|
|
|