From 1ee3c12f537c0f4854c2e2d80bee5486183804ae Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 19 Jan 2017 10:43:23 -0600 Subject: [PATCH] libpkgconf: path: use pkgconf_path_relocate() when matching paths --- libpkgconf/path.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libpkgconf/path.c b/libpkgconf/path.c index e779f75..7638a94 100644 --- a/libpkgconf/path.c +++ b/libpkgconf/path.c @@ -189,12 +189,18 @@ bool pkgconf_path_match_list(const char *path, const pkgconf_list_t *dirlist) { pkgconf_node_t *n = NULL; + char relocated[PKGCONF_BUFSIZE]; + const char *cpath = path; + + pkgconf_strlcpy(relocated, path, sizeof relocated); + if (pkgconf_path_relocate(relocated, sizeof relocated)) + cpath = path; PKGCONF_FOREACH_LIST_ENTRY(dirlist->head, n) { pkgconf_path_t *pnode = n->data; - if (!strcmp(pnode->path, path)) + if (!strcmp(pnode->path, cpath)) return true; }