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

xbps-query: ownedby: simplify and avoid xbps_pkgpattern_match, fnmatch is enough.

Browse Source
This commit is contained in:
Juan RP 2012-12-15 19:19:42 +01:00
parent bb877b0db7
commit 23e7f317f8
1 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
bin/xbps-query/ownedby.c
View File

@ -40,18 +40,17 @@ struct ffdata {
const char *repouri; const char *repouri;
}; };
static int static void
match_files_by_pattern(prop_dictionary_t pkg_filesd, match_files_by_pattern(prop_dictionary_t pkg_filesd,
prop_dictionary_keysym_t key, prop_dictionary_keysym_t key,
int npatterns, struct ffdata *ffd,
char **patterns, const char *pkgver)
const char *pkgname)
{ {
prop_object_iterator_t iter;
prop_array_t array; prop_array_t array;
prop_object_t obj; prop_object_t obj;
const char *keyname, *filestr, *typestr; const char *keyname, *filestr, *typestr;
int i; unsigned int i;
int x;
keyname = prop_dictionary_keysym_cstring_nocopy(key); keyname = prop_dictionary_keysym_cstring_nocopy(key);
@ -64,22 +63,20 @@ match_files_by_pattern(prop_dictionary_t pkg_filesd,
else if (strcmp(keyname, "conf_files") == 0) else if (strcmp(keyname, "conf_files") == 0)
typestr = "configuration file"; typestr = "configuration file";
else else
return 0; return;
array = prop_dictionary_get_keysym(pkg_filesd, key); array = prop_dictionary_get_keysym(pkg_filesd, key);
iter = prop_array_iterator(array); for (i = 0; i < prop_array_count(array); i++) {
obj = prop_array_get(array, i);
while ((obj = prop_object_iterator_next(iter))) {
prop_dictionary_get_cstring_nocopy(obj, "file", &filestr); prop_dictionary_get_cstring_nocopy(obj, "file", &filestr);
for (i = 0; i < npatterns; i++) { for (x = 0; x < ffd->npatterns; x++) {
if ((xbps_pkgpattern_match(filestr, patterns[i])) || if ((strcmp(filestr, ffd->patterns[x]) == 0) ||
(strcmp(filestr, patterns[i]) == 0)) (fnmatch(ffd->patterns[x], filestr, FNM_PERIOD)) == 0) {
printf("%s: %s (%s)\n", pkgname, filestr, typestr); printf("%s: %s (%s)\n", pkgver,
filestr, typestr);
}
} }
} }
prop_object_iterator_release(iter);
return 0;
} }
static int static int
@ -89,25 +86,19 @@ ownedby_pkgdb_cb(struct xbps_handle *xhp, prop_object_t obj, void *arg, bool *do
prop_array_t files_keys; prop_array_t files_keys;
struct ffdata *ffd = arg; struct ffdata *ffd = arg;
unsigned int i; unsigned int i;
const char *pkgname; const char *pkgver;
int rv = 0;
(void)done; (void)done;
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname); prop_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
pkgmetad = xbps_pkgdb_get_pkg_metadata(xhp, pkgname); pkgmetad = xbps_pkgdb_get_pkg_metadata(xhp, pkgver);
files_keys = prop_dictionary_all_keys(pkgmetad); files_keys = prop_dictionary_all_keys(pkgmetad);
for (i = 0; i < prop_array_count(files_keys); i++) { for (i = 0; i < prop_array_count(files_keys); i++) {
rv = match_files_by_pattern(pkgmetad, match_files_by_pattern(pkgmetad,
prop_array_get(files_keys, i), prop_array_get(files_keys, i), ffd, pkgver);
ffd->npatterns, ffd->patterns, pkgname);
if (rv == -1)
break;
} }
prop_object_release(files_keys); return 0;
return rv;
} }
int int
@ -134,8 +125,8 @@ repo_match_files_by_pattern(prop_dictionary_t pkgd,
for (i = 0; i < prop_array_count(array); i++) { for (i = 0; i < prop_array_count(array); i++) {
prop_array_get_cstring_nocopy(array, i, &filestr); prop_array_get_cstring_nocopy(array, i, &filestr);
for (x = 0; x < ffd->npatterns; x++) { for (x = 0; x < ffd->npatterns; x++) {
if ((xbps_pkgpattern_match(filestr, ffd->patterns[x])) || if ((strcmp(filestr, ffd->patterns[x]) == 0) ||
(strcmp(filestr, ffd->patterns[x]) == 0)) { (fnmatch(ffd->patterns[x], filestr, FNM_PERIOD)) == 0) {
prop_dictionary_get_cstring_nocopy(pkgd, prop_dictionary_get_cstring_nocopy(pkgd,
"pkgver", &pkgver); "pkgver", &pkgver);
printf("%s: %s (%s)\n", printf("%s: %s (%s)\n",
@ -161,7 +152,6 @@ repo_ownedby_cb(struct xbps_rindex *rpi, void *arg, bool *done)
return ENOMEM; return ENOMEM;
if ((idxfiles = prop_dictionary_internalize_from_zfile(plist)) == NULL) { if ((idxfiles = prop_dictionary_internalize_from_zfile(plist)) == NULL) {
free(plist);
if (errno == ENOENT) { if (errno == ENOENT) {
fprintf(stderr, "%s: index-files missing! " fprintf(stderr, "%s: index-files missing! "
"ignoring...\n", rpi->uri); "ignoring...\n", rpi->uri);
@ -169,10 +159,9 @@ repo_ownedby_cb(struct xbps_rindex *rpi, void *arg, bool *done)
} }
return errno; return errno;
} }
free(plist);
ffd->repouri = rpi->uri; ffd->repouri = rpi->uri;
allkeys = prop_dictionary_all_keys(idxfiles); allkeys = prop_dictionary_all_keys(idxfiles);
for (i = 0; i < prop_array_count(allkeys); i++) { for (i = 0; i < prop_array_count(allkeys); i++) {
ksym = prop_array_get(allkeys, i); ksym = prop_array_get(allkeys, i);
pkgd = prop_dictionary_get_keysym(idxfiles, ksym); pkgd = prop_dictionary_get_keysym(idxfiles, ksym);