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

xbps-query/search: simplify.

Browse Source
This commit is contained in:
Juan RP 2014-10-17 10:09:34 +02:00
parent 5c8c7b1172
commit 84a16c86cc
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,13 +103,15 @@ search_array_cb(struct xbps_handle *xhp _unused,
{ {
xbps_object_t obj2; xbps_object_t obj2;
struct search_data *sd = arg; struct search_data *sd = arg;
const char *pkgver, *desc, *str; const char *pkgver = NULL, *desc, *str;
regex_t regex; regex_t regex;
if (!xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver))
return 0;
if (sd->prop == NULL) { if (sd->prop == NULL) {
bool vpkgfound = false; bool vpkgfound = false;
/* no prop set, match on pkgver/short_desc objects */ /* no prop set, match on pkgver/short_desc objects */
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
xbps_dictionary_get_cstring_nocopy(obj, "short_desc", &desc); xbps_dictionary_get_cstring_nocopy(obj, "short_desc", &desc);
if (sd->repo_mode && xbps_match_virtual_pkg_in_dict(obj, sd->pat)) if (sd->repo_mode && xbps_match_virtual_pkg_in_dict(obj, sd->pat))
@ -150,7 +152,6 @@ search_array_cb(struct xbps_handle *xhp _unused,
if (regcomp(&regex, sd->pat, REG_EXTENDED|REG_NOSUB) != 0) if (regcomp(&regex, sd->pat, REG_EXTENDED|REG_NOSUB) != 0)
return errno; return errno;
if (regexec(&regex, str, 0, 0, 0) == 0) { if (regexec(&regex, str, 0, 0, 0) == 0) {
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
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
@ -160,7 +161,6 @@ search_array_cb(struct xbps_handle *xhp _unused,
} else { } else {
if ((strcasestr(str, sd->pat)) || if ((strcasestr(str, sd->pat)) ||
(fnmatch(sd->pat, str, FNM_PERIOD)) == 0) { (fnmatch(sd->pat, str, FNM_PERIOD)) == 0) {
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
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
@ -172,7 +172,6 @@ search_array_cb(struct xbps_handle *xhp _unused,
/* property is a number */ /* property is a number */
char size[8]; char size[8];
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
if (xbps_humanize_number(size, xbps_number_integer_value(obj2)) == -1) if (xbps_humanize_number(size, xbps_number_integer_value(obj2)) == -1)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -196,7 +195,6 @@ search_array_cb(struct xbps_handle *xhp _unused,
} }
} else if (xbps_object_type(obj2) == XBPS_TYPE_BOOL) { } else if (xbps_object_type(obj2) == XBPS_TYPE_BOOL) {
/* property is a bool */ /* property is a bool */
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
if (sd->repo_mode) if (sd->repo_mode)
printf("%s: true (%s)\n", pkgver, sd->repourl); printf("%s: true (%s)\n", pkgver, sd->repourl);
else else
@ -209,7 +207,6 @@ search_array_cb(struct xbps_handle *xhp _unused,
if (regcomp(&regex, sd->pat, REG_EXTENDED|REG_NOSUB) != 0) if (regcomp(&regex, sd->pat, REG_EXTENDED|REG_NOSUB) != 0)
return errno; return errno;
if (regexec(&regex, str, 0, 0, 0) == 0) { if (regexec(&regex, str, 0, 0, 0) == 0) {
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
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
@ -218,7 +215,6 @@ search_array_cb(struct xbps_handle *xhp _unused,
regfree(&regex); regfree(&regex);
} else { } else {
if (strcasestr(str, sd->pat)) { if (strcasestr(str, sd->pat)) {
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
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