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

Implemented blueprint 'install-pkg-by-pkgmatch' as specified in

Browse Source 
https://blueprints.launchpad.net/xbps/+spec/install-pkg-by-pkgmatch

The implementation works as expected, it was easier that I thought.
Bump XBPS_RELVER because the API was changed slightly.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20100114011431-xv5q6bgahm6v9dbq
This commit is contained in:
Juan RP
2010-01-14 02:14:31 +01:00
parent 6c29fe7514
commit 023841b060
12 changed files with 120 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/plist.c
View File

@ -1,5 +1,5 @@
/*-
* Copyright (c) 2008-2009 Juan Romero Pardines.
* Copyright (c) 2008-2010 Juan Romero Pardines.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -134,7 +134,7 @@ xbps_find_pkg_from_plist(const char *plist, const char *pkgname)
if (dict == NULL)
return NULL;
obj = xbps_find_pkg_in_dict(dict, "packages", pkgname);
obj = xbps_find_pkg_in_dict_by_name(dict, "packages", pkgname);
if (obj == NULL) {
prop_object_release(dict);
return NULL;
@ -155,7 +155,7 @@ xbps_find_pkg_installed_from_plist(const char *pkgname)
if ((d = xbps_regpkgs_dictionary_init()) == NULL)
return NULL;
pkgd = xbps_find_pkg_in_dict(d, "packages", pkgname);
pkgd = xbps_find_pkg_in_dict_by_name(d, "packages", pkgname);
if (pkgd == NULL)
goto fail;
@ -179,8 +179,8 @@ fail:
}
prop_dictionary_t SYMEXPORT
xbps_find_pkg_in_dict(prop_dictionary_t dict, const char *key,
const char *pkgname)
xbps_find_pkg_in_dict_by_name(prop_dictionary_t dict, const char *key,
const char *pkgname)
{
prop_object_iterator_t iter;
prop_object_t obj = NULL;
@ -190,8 +190,7 @@ xbps_find_pkg_in_dict(prop_dictionary_t dict, const char *key,
assert(pkgname != NULL);
assert(key != NULL);
iter = xbps_get_array_iter_from_dict(dict, key);
if (iter == NULL)
if ((iter = xbps_get_array_iter_from_dict(dict, key)) == NULL)
return NULL;
while ((obj = prop_object_iterator_next(iter))) {
@ -208,6 +207,35 @@ xbps_find_pkg_in_dict(prop_dictionary_t dict, const char *key,
return obj;
}
prop_dictionary_t SYMEXPORT
xbps_find_pkg_in_dict_by_pkgmatch(prop_dictionary_t dict, const char *key,
const char *pkgmatch)
{
prop_object_iterator_t iter;
prop_object_t obj = NULL;
const char *pkgver;
assert(dict != NULL);
assert(key != NULL);
assert(pkgmatch != NULL);
if ((iter = xbps_get_array_iter_from_dict(dict, key)) == NULL)
return NULL;
while ((obj = prop_object_iterator_next(iter))) {
if (!prop_dictionary_get_cstring_nocopy(obj,
"pkgver", &pkgver))
break;
if (xbps_pkgdep_match(pkgver, __UNCONST(pkgmatch)))
break;
}
prop_object_iterator_release(iter);
if (obj == NULL)
errno = ENOENT;
return obj;
}
bool SYMEXPORT
xbps_find_string_in_array(prop_array_t array, const char *val)
{