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

xbps_repository_get_pkg_plist_dict: use xbps_repository_pool_find_pkg().

Browse Source
This commit is contained in:
Juan RP 2011-01-18 15:19:27 +01:00
parent 8e0a94d5cc
commit 6d7121c5bd
1 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
lib/repository_plist.c
View File

@ -221,56 +221,18 @@ xbps_repository_get_pkg_plist_dict_from_url(const char *url, const char *plistf)
return plistd; return plistd;
} }
struct rpool_index_data {
prop_dictionary_t plistd;
const char *plistf;
const char *pkgname;
};
static int
repo_find_pkg_plistd_cb(struct repository_pool_index *rpi, void *arg, bool *done)
{
struct rpool_index_data *rid = arg;
prop_dictionary_t pkgd;
char *url;
pkgd = xbps_find_pkg_in_dict_by_name(rpi->rpi_repod,
"packages", rid->pkgname);
if (pkgd == NULL) {
if (errno != ENOENT)
return errno;
return 0;
}
url = xbps_repository_get_path_from_pkg_dict(pkgd, rpi->rpi_uri);
if (url == NULL)
return EINVAL;
rid->plistd =
xbps_repository_get_pkg_plist_dict_from_url(url, rid->plistf);
free(url);
if (prop_object_type(rid->plistd) == PROP_TYPE_DICTIONARY)
*done = true;
return 0;
}
prop_dictionary_t prop_dictionary_t
xbps_repository_get_pkg_plist_dict(const char *pkgname, const char *plistf) xbps_repository_get_pkg_plist_dict(const char *pkgname, const char *plistf)
{ {
prop_dictionary_t plistd = NULL; prop_dictionary_t pkgd = NULL, plistd = NULL;
struct rpool_index_data *rid; const char *repoloc;
char *url;
int rv = 0; int rv = 0;
if ((rv = xbps_repository_pool_init()) != 0) { if ((rv = xbps_repository_pool_init()) != 0) {
errno = rv; errno = rv;
return NULL; return NULL;
} }
rid = malloc(sizeof(struct rpool_index_data));
if (rid == NULL)
goto out;
/* /*
* Iterate over the the repository pool and search for a plist file * Iterate over the the repository pool and search for a plist file
* in the binary package named 'pkgname'. The plist file will be * in the binary package named 'pkgname'. The plist file will be
@ -280,15 +242,25 @@ xbps_repository_get_pkg_plist_dict(const char *pkgname, const char *plistf)
* This will work locally and remotely, thanks to libarchive and * This will work locally and remotely, thanks to libarchive and
* libfetch! * libfetch!
*/ */
rid->pkgname = pkgname; pkgd = xbps_repository_pool_find_pkg(pkgname, false, false);
rid->plistf = plistf; if (pkgd == NULL)
rv = xbps_repository_pool_foreach(repo_find_pkg_plistd_cb, rid); goto out;
plistd = rid->plistd;
free(rid); prop_dictionary_get_cstring_nocopy(pkgd, "repository", &repoloc);
url = xbps_repository_get_path_from_pkg_dict(pkgd, repoloc);
if (url == NULL) {
errno = EINVAL;
goto out;
}
plistd = xbps_repository_get_pkg_plist_dict_from_url(url, plistf);
free(url);
out: out:
xbps_repository_pool_release(); xbps_repository_pool_release();
if (plistd == NULL) if (plistd == NULL)
errno = ENOENT; errno = ENOENT;
if (pkgd)
prop_object_release(pkgd);
return plistd; return plistd;
} }