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 95a7e82171e839a306b24711ea2c9ccd93b342b6..4b9e06e73d9ce667d8933db51d92ae2a49247148 100644 (file)
--- 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);
 }