From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 20 Apr 2021 11:31:05 +0000 (+0000)
Subject: util: Change behaviour of pakfire_path_join
X-Git-Tag: 0.9.28~1285^2~304
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=141435130b54d06bec42fa4650d83ff1d23dfc51;p=pakfire.git

util: Change behaviour of pakfire_path_join

This will now always merge both arguments together and remove any
leading slashes from the second argument

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

diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index 95a7e8217..4b9e06e73 100644
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -288,11 +288,15 @@ char* pakfire_format_date(time_t t) {
 
 int __pakfire_path_join(char* dest, size_t length,
 		const char* first, const char* second) {
+	if (!first)
+		return snprintf(dest, length, "%s", second);
+
 	if (!second)
 		return snprintf(dest, length, "%s", first);
 
-	if (!first || *second == '/')
-		return snprintf(dest, length, "%s", second);
+	// Remove leading slashes from second argument
+	while (*second == '/')
+		second++;
 
 	return snprintf(dest, length, "%s/%s", first, second);
 }