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

Use fs blksize from stat(2)ed file when reading archives.

Browse Source
This commit is contained in:
Juan RP
2013-08-29 14:30:14 +02:00
parent 1bea5725ae
commit 24ff0472dd
6 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/repo.c
View File

@ -28,6 +28,7 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include "xbps_api_impl.h"
@ -50,6 +51,7 @@ struct xbps_repo *
xbps_repo_open(struct xbps_handle *xhp, const char *url)
{
struct xbps_repo *repo;
struct stat st;
const char *arch;
char *repofile;
@ -85,13 +87,22 @@ xbps_repo_open(struct xbps_handle *xhp, const char *url)
archive_read_support_compression_xz(repo->ar);
archive_read_support_format_tar(repo->ar);
if (archive_read_open_filename(repo->ar, repofile, ARCHIVE_READ_BLOCKSIZE)) {
if (stat(repofile, &st) == -1) {
xbps_dbg_printf(xhp, "[repo] cannot stat repository file %s: %s\n",
repofile, strerror(errno));
archive_read_finish(repo->ar);
free(repo);
repo = NULL;
goto out;
}
if (archive_read_open_filename(repo->ar, repofile, st.st_blksize) == ARCHIVE_FATAL) {
xbps_dbg_printf(xhp, "[repo] cannot open repository file %s: %s\n",
repofile, strerror(archive_errno(repo->ar)));
archive_read_free(repo->ar);
archive_read_finish(repo->ar);
free(repo);
repo = NULL;
}
out:
free(repofile);
return repo;
}
@ -144,7 +155,7 @@ xbps_repo_close(struct xbps_repo *repo)
if (repo->ar == NULL)
return;
archive_read_free(repo->ar);
archive_read_finish(repo->ar);
if (xbps_object_type(repo->idx) == XBPS_TYPE_DICTIONARY)
xbps_object_release(repo->idx);
if (xbps_object_type(repo->idxfiles) == XBPS_TYPE_DICTIONARY)