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

xbps-query/search: minor optimizations.

Browse Source
This commit is contained in:
Juan RP 2015-02-20 11:01:18 +01:00
parent 7e21f1ee1a
commit 341e8a10ae
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,9 +129,9 @@ search_array_cb(struct xbps_handle *xhp _unused,
xbps_array_add_cstring_nocopy(sd->results, pkgver); xbps_array_add_cstring_nocopy(sd->results, pkgver);
xbps_array_add_cstring_nocopy(sd->results, desc); xbps_array_add_cstring_nocopy(sd->results, desc);
} else { } else {
if ((xbps_pkgpattern_match(pkgver, sd->pat)) || if ((strcasestr(pkgver, sd->pat)) ||
(strcasestr(pkgver, sd->pat)) ||
(strcasestr(desc, sd->pat))) { (strcasestr(desc, sd->pat))) {
(xbps_pkgpattern_match(pkgver, sd->pat)) ||
xbps_array_add_cstring_nocopy(sd->results, pkgver); xbps_array_add_cstring_nocopy(sd->results, pkgver);
xbps_array_add_cstring_nocopy(sd->results, desc); xbps_array_add_cstring_nocopy(sd->results, desc);
} }
@ -152,8 +152,7 @@ search_array_cb(struct xbps_handle *xhp _unused,
printf("%s: %s\n", pkgver, str); printf("%s: %s\n", pkgver, str);
} }
} else { } else {
if ((strcasestr(str, sd->pat)) || if (strcasestr(str, sd->pat)) {
(fnmatch(sd->pat, str, FNM_PERIOD)) == 0) {
if (sd->repo_mode) if (sd->repo_mode)
printf("%s: %s (%s)\n", pkgver, str, sd->repourl); printf("%s: %s (%s)\n", pkgver, str, sd->repourl);
else else