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

libxbps: make xbps_find_virtualpkg_user *only* look for virtual pkgs.

Browse Source
This commit is contained in:
Juan RP 2011-10-15 19:59:54 +02:00
parent ead8d2460f
commit f2ede44c80
1 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
lib/plist_find.c
View File

@ -155,6 +155,7 @@ find_virtualpkg_user_in_conf(const char *vpkg, bool bypattern)
free(vpkgname); free(vpkgname);
break; break;
} }
free(vpkgname);
} }
} }
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
@ -200,15 +201,12 @@ find_virtualpkg_user_in_array(prop_array_t array,
} }
static prop_dictionary_t static prop_dictionary_t
find_pkg_in_dict(prop_dictionary_t d, find_virtualpkg_user_in_dict(prop_dictionary_t d,
const char *key, const char *key,
const char *str, const char *str,
bool bypattern, bool bypattern)
bool virtual,
bool virtual_in_conf)
{ {
prop_array_t array; prop_array_t array;
prop_dictionary_t vpkgd;
assert(d != NULL); assert(d != NULL);
assert(str != NULL); assert(str != NULL);
@ -218,11 +216,25 @@ find_pkg_in_dict(prop_dictionary_t d,
if (prop_object_type(array) != PROP_TYPE_ARRAY) if (prop_object_type(array) != PROP_TYPE_ARRAY)
return NULL; return NULL;
if (virtual_in_conf) { return find_virtualpkg_user_in_array(array, str, bypattern);
vpkgd = find_virtualpkg_user_in_array(array, str, bypattern); }
if (vpkgd != NULL)
return vpkgd; static prop_dictionary_t
} find_pkg_in_dict(prop_dictionary_t d,
const char *key,
const char *str,
bool bypattern,
bool virtual)
{
prop_array_t array;
assert(d != NULL);
assert(str != NULL);
assert(key != NULL);
array = prop_dictionary_get(d, key);
if (prop_object_type(array) != PROP_TYPE_ARRAY)
return NULL;
return find_pkg_in_array(array, str, bypattern, virtual); return find_pkg_in_array(array, str, bypattern, virtual);
} }
@ -232,7 +244,7 @@ xbps_find_pkg_in_dict_by_name(prop_dictionary_t d,
const char *key, const char *key,
const char *pkgname) const char *pkgname)
{ {
return find_pkg_in_dict(d, key, pkgname, false, false, false); return find_pkg_in_dict(d, key, pkgname, false, false);
} }
prop_dictionary_t prop_dictionary_t
@ -240,7 +252,7 @@ xbps_find_pkg_in_dict_by_pattern(prop_dictionary_t d,
const char *key, const char *key,
const char *pattern) const char *pattern)
{ {
return find_pkg_in_dict(d, key, pattern, true, false, false); return find_pkg_in_dict(d, key, pattern, true, false);
} }
prop_dictionary_t HIDDEN prop_dictionary_t HIDDEN
@ -248,7 +260,7 @@ xbps_find_virtualpkg_in_dict_by_name(prop_dictionary_t d,
const char *key, const char *key,
const char *name) const char *name)
{ {
return find_pkg_in_dict(d, key, name, false, true, false); return find_pkg_in_dict(d, key, name, false, true);
} }
prop_dictionary_t HIDDEN prop_dictionary_t HIDDEN
@ -256,7 +268,7 @@ xbps_find_virtualpkg_in_dict_by_pattern(prop_dictionary_t d,
const char *key, const char *key,
const char *pattern) const char *pattern)
{ {
return find_pkg_in_dict(d, key, pattern, true, true, false); return find_pkg_in_dict(d, key, pattern, true, true);
} }
prop_dictionary_t HIDDEN prop_dictionary_t HIDDEN
@ -264,7 +276,7 @@ xbps_find_virtualpkg_conf_in_dict_by_name(prop_dictionary_t d,
const char *key, const char *key,
const char *name) const char *name)
{ {
return find_pkg_in_dict(d, key, name, false, false, true); return find_virtualpkg_user_in_dict(d, key, name, false);
} }
prop_dictionary_t HIDDEN prop_dictionary_t HIDDEN
@ -272,7 +284,7 @@ xbps_find_virtualpkg_conf_in_dict_by_pattern(prop_dictionary_t d,
const char *key, const char *key,
const char *pattern) const char *pattern)
{ {
return find_pkg_in_dict(d, key, pattern, true, false, true); return find_virtualpkg_user_in_dict(d, key, pattern, true);
} }
static prop_dictionary_t static prop_dictionary_t
@ -292,10 +304,13 @@ find_pkg_dict_from_plist(const char *plist,
plist, str, strerror(errno)); plist, str, strerror(errno));
return NULL; return NULL;
} }
obj = find_pkg_in_dict(dict, key, str, bypattern, true, true); obj = find_virtualpkg_user_in_dict(dict, key, str, bypattern);
if (obj == NULL) { if (obj == NULL) {
prop_object_release(dict); obj = find_pkg_in_dict(dict, key, str, bypattern, true);
return NULL; if (obj == NULL) {
prop_object_release(dict);
return NULL;
}
} }
res = prop_dictionary_copy(obj); res = prop_dictionary_copy(obj);
prop_object_release(dict); prop_object_release(dict);
@ -332,10 +347,14 @@ find_pkgd_installed(const char *str, bool bypattern, bool virtual)
if (xhp->regpkgdb_dictionary == NULL) if (xhp->regpkgdb_dictionary == NULL)
return NULL; return NULL;
pkgd = find_pkg_in_dict(xhp->regpkgdb_dictionary, pkgd = find_virtualpkg_user_in_dict(xhp->regpkgdb_dictionary,
"packages", str, bypattern, virtual, true); "packages", str, bypattern);
if (pkgd == NULL) {
pkgd = find_pkg_in_dict(xhp->regpkgdb_dictionary,
"packages", str, bypattern, virtual);
}
if (pkgd == NULL) if (pkgd == NULL)
return rpkgd; return NULL;
if (xbps_pkg_state_dictionary(pkgd, &state) != 0) if (xbps_pkg_state_dictionary(pkgd, &state) != 0)
return rpkgd; return rpkgd;