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

Implemented support for working with remote repositories.

Browse Source 
libfetch from NetBSD's pkgsrc has been imported into lib/fetch, but
the objects are embedded into libxbps. Only a public function to fetch
files has been implemented: xbps_fetch_file().

The library now is built with -fvisibility=hidden by default, and
exported symbols are the ones that use the SYMEXPORT macro.

The code works well enough, but will need many more cleanups.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091027004600-0lq9aao67lisbzxv
This commit is contained in:
Juan RP
2009-10-27 01:46:00 +01:00
parent 6a855c0272
commit 7aebea684b
41 changed files with 6039 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/xbps-repo/index.c
View File

@@ -63,8 +63,6 @@ repoidx_getdict(const char *pkgdir)
prop_dictionary_set(dict, "packages", array);
prop_object_release(array);
prop_dictionary_set_cstring_nocopy(dict,
"location-local", pkgdir);
prop_dictionary_set_cstring_nocopy(dict,
"pkgindex-version", XBPS_PKGINDEX_VERSION);
}

132
bin/xbps-repo/main.c
View File

@@ -37,8 +37,6 @@
typedef struct repository_info {
const char *index_version;
const char *location_local;
const char *location_remote;
uint64_t total_pkgs;
} repo_info_t;
@@ -84,14 +82,6 @@ pkgindex_getinfo(prop_dictionary_t dict, repo_info_t *ri)
"pkgindex-version", &ri->index_version))
return false;
if (!prop_dictionary_get_cstring_nocopy(dict,
"location-local", &ri->location_local))
return false;
/* This one is optional, thus don't panic */
prop_dictionary_get_cstring_nocopy(dict, "location-remote",
&ri->location_remote);
if (!prop_dictionary_get_uint64(dict, "total-pkgs",
&ri->total_pkgs))
return false;
@@ -144,13 +134,79 @@ out:
return rv;
}
static int
add_repository(const char *uri, bool remote)
{
prop_dictionary_t dict;
repo_info_t *rinfo;
char *plist, idxstr[PATH_MAX];
int rv = 0;
if (remote) {
rv = xbps_sync_repository_pkg_index(uri);
if (rv != 0)
return rv;
plist = xbps_get_pkg_index_plist(uri);
} else {
if (!sanitize_localpath(idxstr, uri))
return errno;
plist = xbps_get_pkg_index_plist(idxstr);
}
if (plist == NULL)
return errno;
dict = prop_dictionary_internalize_from_file(plist);
if (dict == NULL) {
printf("Repository %s does not contain any "
"xbps pkgindex file.\n", idxstr);
rv = errno;
goto out;
}
rinfo = malloc(sizeof(*rinfo));
if (rinfo == NULL) {
rv = errno;
goto out;
}
if (!pkgindex_getinfo(dict, rinfo)) {
printf("'%s' is incomplete.\n", plist);
rv = EINVAL;
goto out;
}
if (remote)
rv = xbps_register_repository(uri);
else
rv = xbps_register_repository(idxstr);
if (rv != 0) {
printf("ERROR: couldn't register repository (%s)\n",
strerror(rv));
goto out;
}
printf("Added repository at %s (%s) with %ju packages.\n",
uri, rinfo->index_version, rinfo->total_pkgs);
out:
if (dict != NULL)
prop_object_release(dict);
if (rinfo != NULL)
free(rinfo);
if (plist != NULL)
free(plist);
return rv;
}
int
main(int argc, char **argv)
{
prop_dictionary_t dict;
repo_info_t *rinfo = NULL;
char dpkgidx[PATH_MAX], *plist, *root = NULL;
char dpkgidx[PATH_MAX], *root = NULL;
int c, rv = 0;
bool remote_repo = false;
while ((c = getopt(argc, argv, "Vr:")) != -1) {
switch (c) {
@@ -179,53 +235,11 @@ main(int argc, char **argv)
if (argc != 2)
usage();
if (!sanitize_localpath(dpkgidx, argv[1]))
exit(EXIT_FAILURE);
if ((strncmp(argv[1], "http://", 7) == 0) ||
(strncmp(argv[1], "ftp://", 6) == 0))
remote_repo = true;
/* Temp buffer to verify pkgindex file. */
plist = xbps_get_pkg_index_plist(dpkgidx);
if (plist == NULL)
exit(EXIT_FAILURE);
dict = prop_dictionary_internalize_from_file(plist);
if (dict == NULL) {
printf("Directory %s does not contain any "
"xbps pkgindex file.\n", dpkgidx);
free(plist);
exit(EXIT_FAILURE);
}
rinfo = malloc(sizeof(*rinfo));
if (rinfo == NULL) {
prop_object_release(dict);
free(plist);
exit(EXIT_FAILURE);
}
if (!pkgindex_getinfo(dict, rinfo)) {
printf("'%s' is incomplete.\n", plist);
prop_object_release(dict);
free(rinfo);
free(plist);
exit(EXIT_FAILURE);
}
if ((rv = xbps_register_repository(dpkgidx)) != 0) {
printf("ERROR: couldn't register repository (%s)\n",
strerror(rv));
prop_object_release(dict);
free(rinfo);
free(plist);
exit(EXIT_FAILURE);
}
printf("Added repository at %s (%s) with %ju packages.\n",
rinfo->location_local, rinfo->index_version,
rinfo->total_pkgs);
prop_object_release(dict);
free(rinfo);
free(plist);
rv = add_repository(argv[1], remote_repo);
} else if (strcasecmp(argv[0], "list") == 0) {
/* Lists all repositories registered in pool. */

18
bin/xbps-repo/util.c
View File

@@ -248,10 +248,8 @@ int
show_pkg_info_from_repolist(prop_object_t obj, void *arg, bool *loop_done)
{
prop_dictionary_t dict, pkgdict;
prop_string_t oloc;
const char *repofile, *repoloc;
const char *repofile;
char *plist;
assert(prop_object_type(obj) == PROP_TYPE_STRING);
/* Get the location */
@@ -276,19 +274,7 @@ show_pkg_info_from_repolist(prop_object_t obj, void *arg, bool *loop_done)
return 0;
}
oloc = prop_dictionary_get(dict, "location-remote");
if (oloc == NULL)
oloc = prop_dictionary_get(dict, "location-local");
if (oloc && prop_object_type(oloc) == PROP_TYPE_STRING)
repoloc = prop_string_cstring_nocopy(oloc);
else {
prop_object_release(dict);
free(plist);
return EINVAL;
}
printf("Repository: %s\n", repoloc);
printf("Repository: %s\n", repofile);
show_pkg_info(pkgdict);
*loop_done = true;
prop_object_release(dict);