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

xbps_get_pkg_plist_dict_from_repo: split reading the pkg plist dict

Browse Source 
from an url into a new function, xbps_get_pkg_plist_dict_from_url.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091125025258-dnq0lstx67xj6w8t
This commit is contained in:
Juan RP 2009-11-25 02:52:58 +00:00
parent 3117c8b4ee
commit 787416a0cd
2 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/xbps_api.h
View File

@ -187,6 +187,8 @@ int SYMEXPORT xbps_unregister_repository(const char *);
/* From lib/repository_plist.c */ /* From lib/repository_plist.c */
prop_dictionary_t SYMEXPORT prop_dictionary_t SYMEXPORT
xbps_get_pkg_plist_dict_from_repo(const char *, const char *); xbps_get_pkg_plist_dict_from_repo(const char *, const char *);
prop_dictionary_t SYMEXPORT
xbps_get_pkg_plist_dict_from_url(const char *, const char *);
/* From lib/requiredby.c */ /* From lib/requiredby.c */
int SYMEXPORT xbps_requiredby_pkg_add(prop_array_t, prop_dictionary_t); int SYMEXPORT xbps_requiredby_pkg_add(prop_array_t, prop_dictionary_t);

82
lib/repository_plist.c
View File

@ -136,17 +136,53 @@ open_archive(const char *url)
return a; return a;
} }
prop_dictionary_t SYMEXPORT
xbps_get_pkg_plist_dict_from_url(const char *url, const char *plistf)
{
prop_dictionary_t plistd = NULL;
struct archive *a;
struct archive_entry *entry;
const char *curpath;
int i = 0;
if ((a = open_archive(url)) == NULL)
return NULL;
while ((archive_read_next_header(a, &entry)) == ARCHIVE_OK) {
curpath = archive_entry_pathname(entry);
if (i >= 5) {
/*
* Archive does not contain required plist
* file, discard it completely.
*/
errno = ENOENT;
break;
}
if (strstr(curpath, plistf) == 0) {
archive_read_data_skip(a);
i++;
continue;
}
plistd = xbps_read_dict_from_archive_entry(a, entry);
if (plistd == NULL) {
errno = EINVAL;
break;
}
break;
}
archive_read_finish(a);
return plistd;
}
prop_dictionary_t SYMEXPORT prop_dictionary_t SYMEXPORT
xbps_get_pkg_plist_dict_from_repo(const char *pkgname, const char *plistf) xbps_get_pkg_plist_dict_from_repo(const char *pkgname, const char *plistf)
{ {
prop_dictionary_t plistd = NULL, pkgd; prop_dictionary_t plistd = NULL, pkgd;
struct repository_data *rdata; struct repository_data *rdata;
struct archive *a;
struct archive_entry *entry;
const char *arch, *filen; const char *arch, *filen;
char *url = NULL; char *url = NULL;
int i = 0, rv = 0; int rv = 0;
bool found = false;
if ((rv = xbps_prepare_repolist_data()) != 0) { if ((rv = xbps_prepare_repolist_data()) != 0) {
errno = rv; errno = rv;
@ -176,46 +212,16 @@ xbps_get_pkg_plist_dict_from_repo(const char *pkgname, const char *plistf)
if (url == NULL) if (url == NULL)
break; break;
if ((a = open_archive(url)) == NULL) { plistd = xbps_get_pkg_plist_dict_from_url(url, plistf);
if (plistd != NULL) {
free(url); free(url);
goto out; break;
} }
free(url); free(url);
while ((archive_read_next_header(a, &entry)) == ARCHIVE_OK) {
const char *curpath = archive_entry_pathname(entry);
if (i >= 5) {
/*
* Archive does not contain required plist
* file, discard it completely.
*/
archive_read_finish(a);
errno = ENOENT;
goto out;
}
if (strstr(curpath, plistf) == 0) {
archive_read_data_skip(a);
i++;
continue;
}
plistd = xbps_read_dict_from_archive_entry(a, entry);
if (plistd == NULL) {
archive_read_finish(a);
errno = EINVAL;
goto out;
}
found = true;
break;
}
archive_read_finish(a);
if (found)
break;
} }
out:
xbps_release_repolist_data(); xbps_release_repolist_data();
if (found == false) if (plistd == NULL)
errno = ENOENT; errno = ENOENT;
return plistd; return plistd;