emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-query: search: simplify and use xbps_match_virtual_pkg_in_dict().

Browse Source
This commit is contained in:
Juan RP 2013-06-14 09:40:10 +02:00
parent 89ded69bed
commit 5c3985ddf1
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bin/xbps-query/search.c
View File

@ -110,39 +110,18 @@ search_pkgs_cb(struct xbps_repo *repo, void *arg, bool *done)
allkeys = prop_dictionary_all_keys(repo->idx); allkeys = prop_dictionary_all_keys(repo->idx);
for (i = 0; i < prop_array_count(allkeys); i++) { for (i = 0; i < prop_array_count(allkeys); i++) {
prop_array_t provides = NULL;
ksym = prop_array_get(allkeys, i); ksym = prop_array_get(allkeys, i);
pkgd = prop_dictionary_get_keysym(repo->idx, ksym); pkgd = prop_dictionary_get_keysym(repo->idx, ksym);
prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver); prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver);
prop_dictionary_get_cstring_nocopy(pkgd, "short_desc", &desc); prop_dictionary_get_cstring_nocopy(pkgd, "short_desc", &desc);
provides = prop_dictionary_get(pkgd, "provides");
for (x = 0; x < sd->npatterns; x++) { for (x = 0; x < sd->npatterns; x++) {
unsigned int j;
bool vpkgfound = false; bool vpkgfound = false;
for (j = 0; j < prop_array_count(provides); j++) { if (xbps_match_virtual_pkg_in_dict(pkgd, sd->patterns[x], false))
const char *vpkgver;
char *tmp, *vpkgname;
prop_array_get_cstring_nocopy(provides, j, &vpkgver);
if (strchr(vpkgver, '_') == NULL)
tmp = xbps_xasprintf("%s_1", vpkgver);
else
tmp = strdup(vpkgver);
vpkgname = xbps_pkg_name(tmp);
if (strcasecmp(vpkgname, sd->patterns[x]) == 0) {
free(vpkgname);
free(tmp);
vpkgfound = true; vpkgfound = true;
break;
}
free(vpkgname);
free(tmp);
}
if ((xbps_pkgpattern_match(pkgver, sd->patterns[x])) || if ((xbps_pkgpattern_match(pkgver, sd->patterns[x])) ||
(strcasestr(pkgver, sd->patterns[x])) || (strcasestr(pkgver, sd->patterns[x])) ||
(strcasestr(desc, sd->patterns[x])) || vpkgfound) { (strcasestr(desc, sd->patterns[x])) || vpkgfound) {