From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 18 May 2021 15:24:09 +0000 (+0000)
Subject: arch: Use buildtarget to make machine and append "-gnu"
X-Git-Tag: 0.9.28~1285^2~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa98d8cbbe58ce600b3a98fadc4d0a0e9bc5d864;p=pakfire.git

arch: Use buildtarget to make machine and append "-gnu"

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

diff --git a/src/libpakfire/arch.c b/src/libpakfire/arch.c
index e39650566..39a522590 100644
--- a/src/libpakfire/arch.c
+++ b/src/libpakfire/arch.c
@@ -149,6 +149,25 @@ unsigned long pakfire_arch_personality(const char* name) {
 }
 
 int __pakfire_arch_machine(char* buffer, size_t length, const char* arch, const char* vendor) {
+	int r = __pakfire_arch_buildtarget(buffer, length, arch, vendor);
+	if (r < 0)
+		return r;
+
+	size_t bytes_written = strlen(buffer);
+
+	// Fail if there is no space left
+	if (bytes_written >= length)
+		return -1;
+
+	// Append -gnu
+	r = snprintf(buffer + bytes_written, length - bytes_written, "-gnu");
+	if (r < 0)
+		return r;
+
+	return 0;
+}
+
+int __pakfire_arch_buildtarget(char* buffer, size_t length, const char* arch, const char* vendor) {
 	if (!vendor)
 		vendor = "unknown";
 
@@ -165,23 +184,7 @@ int __pakfire_arch_machine(char* buffer, size_t length, const char* arch, const
 		*space = '\0';
 
 	// Format string
-	int r = snprintf(buffer, length, "%s-%s-linux-gnu", arch, suffix);
-	if (r < 0)
-		return r;
-
-	// Make everything lowercase
-	for (unsigned int i = 0; i <= (unsigned int)r; i++)
-		buffer[i] = tolower(buffer[i]);
-
-	return 0;
-}
-
-int __pakfire_arch_buildtarget(char* buffer, size_t length, const char* arch, const char* vendor) {
-	if (!vendor)
-		vendor = "unknown";
-
-	// Format string
-	int r = snprintf(buffer, length, "%s-%s-linux", arch, vendor);
+	int r = snprintf(buffer, length, "%s-%s-linux", arch, suffix);
 	if (r < 0)
 		return r;