From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 6 Oct 2023 14:55:19 +0000 (+0000)
Subject: archive: Change how we search for realtive paths in archives
X-Git-Tag: 0.9.30~1530
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45927b9a29204804ebfb5690222bd8ad210f1e1f;p=pakfire.git

archive: Change how we search for realtive paths in archives

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

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index 1dfbdefde..68c6d4d51 100644
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -622,7 +622,7 @@ static int __pakfire_archive_read_filter(struct pakfire* pakfire, struct archive
 		return PAKFIRE_WALK_ERROR;
 
 	// We found a match
-	if (strcmp(cookie->path, p) == 0)
+	if (strcmp(cookie->path + 1, p) == 0)
 		return PAKFIRE_WALK_DONE;
 
 	// Otherwise we skip the file
@@ -654,11 +654,6 @@ PAKFIRE_EXPORT FILE* pakfire_archive_read(struct pakfire_archive* archive, const
 		return NULL;
 	}
 
-	// Strip leading / from filenames, because tarballs don't use any leading slashes
-	path = pakfire_path_relpath("/", path);
-	if (!path)
-		return NULL;
-
 	// Allocate a cookie
 	cookie = calloc(1, sizeof(*cookie));
 	if (!cookie) {