use resolved_path for filelist_contains

alpm_filelist_contains was being used to search for resolved paths, but
searching in the unresolved paths, causing it to miss matches.  We
always search unresolved paths and search the resolved paths if
available because _alpm_filelist_resolve is not public and requires
a context handle, so it can't be called from alpm_filelist_contains.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 12 insertions, 3 deletions

diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c
index b0dcee4e..6a24903d 100644
--- a/lib/libalpm/filelist.c
+++ b/lib/libalpm/filelist.c
@@ -324,10 +324,10 @@ int _alpm_files_cmp(const void *f1, const void *f2)
 }
 
 
-alpm_file_t *alpm_filelist_contains(alpm_filelist_t *filelist,
+char *alpm_filelist_contains(alpm_filelist_t *filelist,
 		const char *path)
 {
-	alpm_file_t key;
+	alpm_file_t key, *match;
 
 	if(!filelist) {
 		return NULL;
@@ -335,8 +335,17 @@ alpm_file_t *alpm_filelist_contains(alpm_filelist_t *filelist,
 
 	key.name = (char *)path;
 
-	return bsearch(&key, filelist->files, filelist->count,
+	match = bsearch(&key, filelist->files, filelist->count,
 			sizeof(alpm_file_t), _alpm_files_cmp);
+
+	if(match) {
+		return match->name;
+	} else if(filelist->resolved_path) {
+		return bsearch(&path, filelist->resolved_path, filelist->count,
+				sizeof(char *), _alpm_filelist_strcmp);
+	} else {
+		return NULL;
+	}
 }
 
 /* vim: set ts=2 sw=2 noet: */