From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 22 Feb 2025 20:57:54 +0000 (+0000)
Subject: arch: Don't use TLS to store the utsname struct
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd041dd07755d233034a8cd566358e97c1e9c387;p=pakfire.git

arch: Don't use TLS to store the utsname struct

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/pakfire/arch.c b/src/pakfire/arch.c
index ef7ba083..02923876 100644
--- a/src/pakfire/arch.c
+++ b/src/pakfire/arch.c
@@ -177,18 +177,14 @@ int __pakfire_arch_buildtarget(char* buffer, size_t length, const char* arch, co
 }
 
 const char* pakfire_arch_native(void) {
-	struct utsname buf;
+	static struct utsname utsname = {};
 
-	static __thread const char* arch_native = NULL;
-
-	if (!arch_native) {
-		if (uname(&buf) < 0)
+	if (!*utsname.machine) {
+		if (uname(&utsname) < 0)
 			return NULL;
-
-		arch_native = strdup(buf.machine);
 	}
 
-	return arch_native;
+	return utsname.machine;
 }
 
 int pakfire_arch_is_compatible(const char* name, const char* compatible_arch) {