moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

Implement AND based package searching.

Browse Source 
This fixes FS#2334.

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
[Dan: add some comments to the code]
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Xavier Chantry 2008-07-24 12:26:09 +02:00 committed by Dan McGee
parent 8877c88def
commit b8e306b73e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libalpm/db.c
View File

@ -357,6 +357,8 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
{ {
const alpm_list_t *i, *j, *k; const alpm_list_t *i, *j, *k;
alpm_list_t *ret = NULL; alpm_list_t *ret = NULL;
/* copy the pkgcache- we will free the list var after each needle */
alpm_list_t *list = alpm_list_copy(_alpm_db_get_pkgcache(db));
ALPM_LOG_FUNC; ALPM_LOG_FUNC;
@ -367,6 +369,7 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
if(i->data == NULL) { if(i->data == NULL) {
continue; continue;
} }
ret = NULL;
targ = i->data; targ = i->data;
_alpm_log(PM_LOG_DEBUG, "searching for target '%s'\n", targ); _alpm_log(PM_LOG_DEBUG, "searching for target '%s'\n", targ);
@ -374,7 +377,7 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
RET_ERR(PM_ERR_INVALID_REGEX, NULL); RET_ERR(PM_ERR_INVALID_REGEX, NULL);
} }
for(j = _alpm_db_get_pkgcache(db); j; j = j->next) { for(j = list; j; j = j->next) {
pmpkg_t *pkg = j->data; pmpkg_t *pkg = j->data;
const char *matched = NULL; const char *matched = NULL;
const char *name = alpm_pkg_get_name(pkg); const char *name = alpm_pkg_get_name(pkg);
@ -407,6 +410,10 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
} }
} }
/* Free the existing search list, and use the returned list for the
* next needle. This allows for AND-based package searching. */
alpm_list_free(list);
list = ret;
regfree(&reg); regfree(&reg);
} }