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

Some changes to know if a file was downloaded successfully or not.

Browse Source 
Improved xbps-repo sync/add and xbps-fetch to print informative
messages when a transfer was not necessary because local/remote size
and/or mtime matched.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091124050326-owez7140fdxwepuk
This commit is contained in:
Juan RP 2009-11-24 05:03:26 +00:00
parent 83f71f3d2b
commit c676622869
5 changed files with 124 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/xbps-bin/install.c
View File

@ -177,9 +177,9 @@ download_package_list(prop_object_iterator_t iter)
rv = xbps_fetch_file(binfile, savedir, false, NULL); rv = xbps_fetch_file(binfile, savedir, false, NULL);
free(savedir); free(savedir);
free(binfile); free(binfile);
if (rv != 0) { if (rv == -1) {
printf("Couldn't download %s from %s (%s)\n", printf("Couldn't download %s from %s (%s)\n",
filename, repoloc, strerror(rv)); filename, repoloc, xbps_fetch_error_string());
free(repoloc_trans); free(repoloc_trans);
return errno; return errno;
} }

4
bin/xbps-fetch/main.c
View File

@ -33,9 +33,11 @@ main(int argc, char **argv)
usage(); usage();
rv = xbps_fetch_file(argv[0], ".", false, flags); rv = xbps_fetch_file(argv[0], ".", false, flags);
if (rv != 0) { if (rv == -1) {
printf("%s: %s\n", argv[0], xbps_fetch_error_string()); printf("%s: %s\n", argv[0], xbps_fetch_error_string());
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} else if (rv == 0) {
printf("%s: file is identical than remote.\n", argv[0]);
} }
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }

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

@ -35,13 +35,8 @@
#include "index.h" #include "index.h"
#include "util.h" #include "util.h"
typedef struct repository_info {
const char *index_version;
uint64_t total_pkgs;
} repo_info_t;
static bool sanitize_localpath(char *, const char *); static bool sanitize_localpath(char *, const char *);
static bool pkgindex_getinfo(prop_dictionary_t, repo_info_t *); static int pkgindex_verify(const char *, const char *, bool);
static void usage(void); static void usage(void);
static void static void
@ -71,24 +66,54 @@ usage(void)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
static bool static int
pkgindex_getinfo(prop_dictionary_t dict, repo_info_t *ri) pkgindex_verify(const char *plist, const char *uri, bool only_sync)
{ {
assert(dict != NULL || ri != NULL); prop_dictionary_t d;
const char *pkgidx_version;
uint64_t total_pkgs;
int rv = 0;
if (!prop_dictionary_get_cstring_nocopy(dict, assert(plist != NULL);
"pkgindex-version", &ri->index_version))
return false;
if (!prop_dictionary_get_uint64(dict, "total-pkgs", d = prop_dictionary_internalize_from_file(plist);
&ri->total_pkgs)) if (d == NULL) {
return false; printf("E: repository %s does not contain any "
"xbps pkgindex file.\n", uri);
return errno;
}
if (!prop_dictionary_get_cstring_nocopy(d,
"pkgindex-version", &pkgidx_version)) {
printf("E: missing 'pkgindex-version' object!\n");
rv = errno;
goto out;
}
if (!prop_dictionary_get_uint64(d, "total-pkgs", &total_pkgs)) {
printf("E: missing 'total-pkgs' object!\n");
rv = errno;
goto out;
}
/* Reject empty repositories, how could this happen? :-) */ /* Reject empty repositories, how could this happen? :-) */
if (ri->total_pkgs <= 0) if (total_pkgs == 0) {
return false; printf("E: empty package list!\n");
rv = EINVAL;
goto out;
}
return true; printf("%s package index at %s (v%s) with %ju packages.\n",
only_sync ? "Updated" : "Added", uri, pkgidx_version, total_pkgs);
out:
prop_object_release(d);
if (rv != 0) {
printf("W: removing incorrect pkg index file: '%s' ...\n",
plist);
rv = remove(plist);
}
return rv;
} }
static bool static bool
@ -135,8 +160,6 @@ out:
static int static int
add_repository(const char *uri) add_repository(const char *uri)
{ {
prop_dictionary_t dict;
repo_info_t *rinfo;
char *plist, idxstr[PATH_MAX]; char *plist, idxstr[PATH_MAX];
int rv = 0; int rv = 0;
@ -146,10 +169,14 @@ add_repository(const char *uri)
printf("Fetching remote package index at %s...\n", uri); printf("Fetching remote package index at %s...\n", uri);
rv = xbps_sync_repository_pkg_index(idxstr); rv = xbps_sync_repository_pkg_index(idxstr);
if (rv != 0) { if (rv == -1) {
printf("Error: could not fetch pkg index file: %s.\n", printf("Error: could not fetch pkg index file: %s.\n",
xbps_fetch_error_string()); xbps_fetch_error_string());
return rv; return rv;
} else if (rv == 0) {
printf("Package index file is already "
"up to date.\n");
return 0;
} }
plist = xbps_get_pkg_index_plist(idxstr); plist = xbps_get_pkg_index_plist(idxstr);
@ -163,25 +190,8 @@ add_repository(const char *uri)
if (plist == NULL) if (plist == NULL)
return errno; return errno;
dict = prop_dictionary_internalize_from_file(plist); if ((rv = pkgindex_verify(plist, idxstr, false)) != 0)
if (dict == NULL) {
printf("Repository %s does not contain any "
"xbps pkgindex file.\n", idxstr);
rv = errno;
goto out; 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 ((rv = xbps_register_repository(idxstr)) != 0) { if ((rv = xbps_register_repository(idxstr)) != 0) {
printf("ERROR: couldn't register repository (%s)\n", printf("ERROR: couldn't register repository (%s)\n",
@ -189,14 +199,7 @@ add_repository(const char *uri)
goto out; goto out;
} }
printf("Added repository at %s (%s) with %ju packages.\n",
idxstr, rinfo->index_version, rinfo->total_pkgs);
out: out:
if (dict != NULL)
prop_object_release(dict);
if (rinfo != NULL)
free(rinfo);
if (plist != NULL) if (plist != NULL)
free(plist); free(plist);
@ -206,8 +209,8 @@ out:
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
char dpkgidx[PATH_MAX], *root = NULL;
struct repository_data *rdata = NULL; struct repository_data *rdata = NULL;
char dpkgidx[PATH_MAX], *plist, *root = NULL;
int c, rv = 0; int c, rv = 0;
while ((c = getopt(argc, argv, "Vr:")) != -1) { while ((c = getopt(argc, argv, "Vr:")) != -1) {
@ -313,8 +316,22 @@ main(int argc, char **argv)
if (xbps_check_is_repo_string_remote(uri)) { if (xbps_check_is_repo_string_remote(uri)) {
printf("Syncing package index from: %s\n", uri); printf("Syncing package index from: %s\n", uri);
rv = xbps_sync_repository_pkg_index(uri); rv = xbps_sync_repository_pkg_index(uri);
if (rv != 0) if (rv == -1) {
printf("Failed! returned: %s\n",
xbps_fetch_error_string());
break; break;
} else if (rv == 0) {
printf("Package index file is already "
"up to date.\n");
continue;
}
plist = xbps_get_pkg_index_plist(uri);
if (plist == NULL) {
rv = EINVAL;
break;
}
(void)pkgindex_verify(plist, uri, true);
free(plist);
} }
} }
xbps_release_repolist_data(); xbps_release_repolist_data();

45
lib/download.c
View File

@ -183,6 +183,10 @@ print_time(time_t *t)
} }
#endif #endif
/*
* Returns -1 on error, 0 if not download (because local/remote
* size and/or mtime match) and 1 if downloaded successfully.
*/
int SYMEXPORT int SYMEXPORT
xbps_fetch_file(const char *uri, const char *outputdir, bool refetch, xbps_fetch_file(const char *uri, const char *outputdir, bool refetch,
const char *flags) const char *flags)
@ -207,15 +211,17 @@ xbps_fetch_file(const char *uri, const char *outputdir, bool refetch,
* Get the filename specified in URI argument. * Get the filename specified in URI argument.
*/ */
filename = strrchr(uri, '/'); filename = strrchr(uri, '/');
if (filename == NULL) if (filename == NULL) {
return EINVAL; errno = EINVAL;
return -1;
}
filename++; filename++;
/* /*
* Compute destination file path. * Compute destination file path.
*/ */
destfile = xbps_xasprintf("%s/%s", outputdir, filename); destfile = xbps_xasprintf("%s/%s", outputdir, filename);
if (destfile == NULL) { if (destfile == NULL) {
rv = errno; rv = -1;
goto out; goto out;
} }
/* /*
@ -227,7 +233,7 @@ xbps_fetch_file(const char *uri, const char *outputdir, bool refetch,
restart = true; restart = true;
} else { } else {
if (errno != ENOENT) { if (errno != ENOENT) {
rv = errno; rv = -1;
goto out; goto out;
} }
} }
@ -235,7 +241,7 @@ xbps_fetch_file(const char *uri, const char *outputdir, bool refetch,
* Prepare stuff for libfetch. * Prepare stuff for libfetch.
*/ */
if ((url = fetchParseURL(uri)) == NULL) { if ((url = fetchParseURL(uri)) == NULL) {
rv = fetchLastErrCode; rv = -1;
goto out; goto out;
} }
@ -246,10 +252,9 @@ xbps_fetch_file(const char *uri, const char *outputdir, bool refetch,
/* /*
* Issue a HEAD request to know size and mtime. * Issue a HEAD request to know size and mtime.
*/ */
if (fetchStat(url, &url_st, NULL) == -1) { if ((rv = fetchStat(url, &url_st, NULL)) == -1)
rv = fetchLastErrCode;
goto out; goto out;
}
/* /*
* If mtime and size match do nothing. * If mtime and size match do nothing.
*/ */
@ -268,7 +273,7 @@ xbps_fetch_file(const char *uri, const char *outputdir, bool refetch,
* Remove current file (if exists). * Remove current file (if exists).
*/ */
if (restart && remove(destfile) == -1) { if (restart && remove(destfile) == -1) {
rv = errno; rv = -1;
goto out; goto out;
} }
restart = false; restart = false;
@ -313,22 +318,23 @@ xbps_fetch_file(const char *uri, const char *outputdir, bool refetch,
if (url->length == 0) if (url->length == 0)
goto out; goto out;
} }
rv = fetchLastErrCode; rv = -1;
goto out; goto out;
} }
if (url_st.size == -1) { if (url_st.size == -1) {
printf("Remote file size is unknown!\n"); printf("Remote file size is unknown!\n");
rv = EINVAL; errno = EINVAL;
rv = -1;
goto out; goto out;
} else if (st.st_size > url_st.size) { } else if (st.st_size > url_st.size) {
printf("Local file %s is greater than remote file!\n", printf("Local file %s is greater than remote file!\n",
filename); filename);
rv = EFBIG; errno = EFBIG;
rv = -1;
goto out; goto out;
} else if (restart && url_st.mtime && url_st.size && } else if (restart && url_st.mtime && url_st.size &&
url_st.size == st.st_size && url_st.mtime == st.st_mtime) { url_st.size == st.st_size && url_st.mtime == st.st_mtime) {
/* Local and remote size/mtime match, do nothing. */ /* Local and remote size/mtime match, do nothing. */
rv = 0;
goto out; goto out;
} }
fprintf(stderr, "Connected to %s.\n", url->host); fprintf(stderr, "Connected to %s.\n", url->host);
@ -342,7 +348,7 @@ xbps_fetch_file(const char *uri, const char *outputdir, bool refetch,
fd = open(destfile, O_WRONLY|O_CREAT|O_TRUNC, 0644); fd = open(destfile, O_WRONLY|O_CREAT|O_TRUNC, 0644);
if (fd == -1) { if (fd == -1) {
rv = errno; rv = -1;
goto out; goto out;
} }
@ -354,7 +360,7 @@ xbps_fetch_file(const char *uri, const char *outputdir, bool refetch,
bytes_written = write(fd, buf, (size_t)bytes_read); bytes_written = write(fd, buf, (size_t)bytes_read);
if (bytes_written != bytes_read) { if (bytes_written != bytes_read) {
fprintf(stderr, "Couldn't write to %s!\n", destfile); fprintf(stderr, "Couldn't write to %s!\n", destfile);
rv = errno; rv = -1;
goto out; goto out;
} }
bytes_dld += bytes_read; bytes_dld += bytes_read;
@ -363,7 +369,8 @@ xbps_fetch_file(const char *uri, const char *outputdir, bool refetch,
if (bytes_read == -1) { if (bytes_read == -1) {
fprintf(stderr, "IO error while fetching %s: %s\n", filename, fprintf(stderr, "IO error while fetching %s: %s\n", filename,
fetchLastErrString); fetchLastErrString);
rv = EINVAL; errno = EIO;
rv = -1;
goto out; goto out;
} }
stat_end(&xs); stat_end(&xs);
@ -379,7 +386,11 @@ xbps_fetch_file(const char *uri, const char *outputdir, bool refetch,
tv[1].tv_sec = url_st.mtime; tv[1].tv_sec = url_st.mtime;
tv[0].tv_usec = tv[1].tv_usec = 0; tv[0].tv_usec = tv[1].tv_usec = 0;
if (utimes(destfile, tv) == -1) if (utimes(destfile, tv) == -1)
rv = errno; rv = -1;
else {
/* File downloaded successfully */
rv = 1;
}
out: out:
if (fd != -1) if (fd != -1)

43
lib/sync_remote_pkgidx.c
View File

@ -68,6 +68,10 @@ xbps_get_remote_repo_string(const char *uri)
return p; return p;
} }
/*
* Returns -1 on error, 0 if transfer was not necessary (local/remote
* size and/or mtime match) and 1 if downloaded successfully.
*/
int SYMEXPORT int SYMEXPORT
xbps_sync_repository_pkg_index(const char *uri) xbps_sync_repository_pkg_index(const char *uri)
{ {
@ -84,15 +88,15 @@ xbps_sync_repository_pkg_index(const char *uri)
metadir = tmp_metafile = lrepofile = NULL; metadir = tmp_metafile = lrepofile = NULL;
if (uname(&un) == -1) if (uname(&un) == -1)
return errno; return -1;
if ((url = fetchParseURL(uri)) == NULL) if ((url = fetchParseURL(uri)) == NULL)
return errno; return -1;
uri_fixedp = xbps_get_remote_repo_string(uri); uri_fixedp = xbps_get_remote_repo_string(uri);
if (uri_fixedp == NULL) { if (uri_fixedp == NULL) {
fetchFreeURL(url); fetchFreeURL(url);
return errno; return -1;
} }
/* /*
@ -101,17 +105,18 @@ xbps_sync_repository_pkg_index(const char *uri)
metadir = xbps_xasprintf("%s/%s", xbps_get_rootdir(), metadir = xbps_xasprintf("%s/%s", xbps_get_rootdir(),
XBPS_META_PATH); XBPS_META_PATH);
if (metadir == NULL) { if (metadir == NULL) {
rv = errno; rv = -1;
goto out; goto out;
} }
rv = stat(metadir, &st); rv = stat(metadir, &st);
if (rv == -1 && errno == ENOENT) { if (rv == -1 && errno == ENOENT) {
if (mkpath(metadir, 0755) == -1) { if (mkpath(metadir, 0755) == -1) {
rv = errno; rv = -1;
goto out; goto out;
} }
} else if (rv == 0 && !S_ISDIR(st.st_mode)) { } else if (rv == 0 && !S_ISDIR(st.st_mode)) {
rv = ENOTDIR; errno = ENOTDIR;
rv = -1;
goto out; goto out;
} }
@ -120,7 +125,7 @@ xbps_sync_repository_pkg_index(const char *uri)
*/ */
rpidx = xbps_xasprintf("%s/%s/%s", uri, un.machine, XBPS_PKGINDEX); rpidx = xbps_xasprintf("%s/%s/%s", uri, un.machine, XBPS_PKGINDEX);
if (rpidx == NULL) { if (rpidx == NULL) {
rv = errno; rv = -1;
goto out; goto out;
} }
/* /*
@ -129,7 +134,7 @@ xbps_sync_repository_pkg_index(const char *uri)
*/ */
tmp_metafile = xbps_xasprintf("%s/%s", metadir, XBPS_PKGINDEX); tmp_metafile = xbps_xasprintf("%s/%s", metadir, XBPS_PKGINDEX);
if (tmp_metafile == NULL) { if (tmp_metafile == NULL) {
rv = errno; rv = -1;
goto out; goto out;
} }
/* /*
@ -138,7 +143,7 @@ xbps_sync_repository_pkg_index(const char *uri)
lrepodir = xbps_xasprintf("%s/%s/%s/%s", lrepodir = xbps_xasprintf("%s/%s/%s/%s",
xbps_get_rootdir(), XBPS_META_PATH, uri_fixedp, un.machine); xbps_get_rootdir(), XBPS_META_PATH, uri_fixedp, un.machine);
if (lrepodir == NULL) { if (lrepodir == NULL) {
rv = errno; rv = -1;
goto out; goto out;
} }
/* /*
@ -156,7 +161,7 @@ xbps_sync_repository_pkg_index(const char *uri)
* Download pkg-index.plist file from repository. * Download pkg-index.plist file from repository.
*/ */
if ((rv = xbps_fetch_file(rpidx, fetch_outputdir, if ((rv = xbps_fetch_file(rpidx, fetch_outputdir,
true, NULL)) != 0) { true, NULL)) == -1) {
(void)remove(tmp_metafile); (void)remove(tmp_metafile);
goto out; goto out;
} }
@ -171,11 +176,12 @@ xbps_sync_repository_pkg_index(const char *uri)
rv = stat(lrepodir, &st); rv = stat(lrepodir, &st);
if (rv == -1 && errno == ENOENT) { if (rv == -1 && errno == ENOENT) {
if (mkpath(lrepodir, 0755) == -1) { if (mkpath(lrepodir, 0755) == -1) {
rv = errno; rv = -1;
goto out; goto out;
} }
} else if (rv == 0 && !S_ISDIR(st.st_mode)) { } else if (rv == 0 && !S_ISDIR(st.st_mode)) {
rv = ENOTDIR; errno = ENOTDIR;
rv = -1;
goto out; goto out;
} }
/* /*
@ -186,31 +192,34 @@ xbps_sync_repository_pkg_index(const char *uri)
dir = xbps_xasprintf("%s/%s/%s/noarch", dir = xbps_xasprintf("%s/%s/%s/noarch",
xbps_get_rootdir(), XBPS_META_PATH, uri_fixedp); xbps_get_rootdir(), XBPS_META_PATH, uri_fixedp);
if (dir == NULL) { if (dir == NULL) {
rv = errno; rv = -1;
goto out; goto out;
} }
rv = stat(dir, &st); rv = stat(dir, &st);
if (rv == -1 && errno == ENOENT) { if (rv == -1 && errno == ENOENT) {
if (mkpath(dir, 0755) == -1) { if (mkpath(dir, 0755) == -1) {
free(dir); free(dir);
rv = errno; rv = -1;
goto out; goto out;
} }
} else if (rv == 0 && !S_ISDIR(st.st_mode)) { } else if (rv == 0 && !S_ISDIR(st.st_mode)) {
free(dir); free(dir);
rv = ENOTDIR; errno = ENOTDIR;
rv = -1;
goto out; goto out;
} }
free(dir); free(dir);
lrepofile = xbps_xasprintf("%s/%s", lrepodir, XBPS_PKGINDEX); lrepofile = xbps_xasprintf("%s/%s", lrepodir, XBPS_PKGINDEX);
if (lrepofile == NULL) { if (lrepofile == NULL) {
rv = errno; rv = -1;
goto out; goto out;
} }
/* /*
* Rename to destination file now it has been fetched successfully. * Rename to destination file now it has been fetched successfully.
*/ */
rv = rename(tmp_metafile, lrepofile); if ((rv = rename(tmp_metafile, lrepofile)) == 0)
rv = 1;
out: out:
if (rpidx) if (rpidx)
free(rpidx); free(rpidx);