wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-02 09:21:47 +02:00
Code Activity

Use libarchive for all compression

Browse source
This commit is contained in:
Yorick van Pelt 2019-12-10 15:47:38 +07:00 • committed by Lars Jellema
parent b19aec7eeb
commit 8a0c00b856
No known key found for this signature in database
GPG key ID: 563A03936D48B4BC
7 changed files with 241 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

104
src/libutil/tarfile.cc
View file

@ -2,83 +2,73 @@
#include <archive_entry.h>
#include "serialise.hh"
#include "tarfile.hh"
namespace nix {
static int callback_open(struct archive *, void *self) {
return ARCHIVE_OK;
}
struct TarArchive {
struct archive * archive;
Source * source;
std::vector<unsigned char> buffer;
static ssize_t callback_read(struct archive * archive, void * _self, const void * * buffer) {
TarArchive *self = (TarArchive *)_self;
*buffer = self->buffer.data();
void check(int err, const char * reason = "failed to extract archive: %s")
{
try {
return self->source->read((char *) self->buffer.data(), 4096);
} catch (EndOfFile &) {
return 0;
} catch (std::exception &err) {
archive_set_error(archive, EIO, "Source threw exception: %s", err.what());
return -1;
}
}
static int callback_close(struct archive *, void *self) {
return ARCHIVE_OK;
}
void TarArchive::check(int err, const char *reason)
{
if (err == ARCHIVE_EOF)
throw EndOfFile("reached end of archive");
else if (err != ARCHIVE_OK)
throw Error(reason, archive_error_string(this->archive));
}
TarArchive(Source & source) : buffer(4096)
{
this->archive = archive_read_new();
this->source = &source;
TarArchive::TarArchive(Source& source, bool raw) : buffer(4096)
{
this->archive = archive_read_new();
this->source = &source;
if (!raw) {
archive_read_support_filter_all(archive);
archive_read_support_format_all(archive);
check(archive_read_open(archive,
(void *)this,
TarArchive::callback_open,
TarArchive::callback_read,
TarArchive::callback_close),
"failed to open archive: %s");
}
TarArchive(const Path & path)
{
this->archive = archive_read_new();
} else {
archive_read_support_filter_all(archive);
archive_read_support_format_all(archive);
check(archive_read_open_filename(archive, path.c_str(), 16384), "failed to open archive: %s");
archive_read_support_format_raw(archive);
archive_read_support_format_empty(archive);
}
check(archive_read_open(archive, (void *)this, callback_open, callback_read, callback_close), "Failed to open archive (%s)");
}
TarArchive(const TarArchive &) = delete;
void close()
{
check(archive_read_close(archive), "failed to close archive: %s");
}
TarArchive::TarArchive(const Path &path)
{
this->archive = archive_read_new();
~TarArchive()
{
if (this->archive) archive_read_free(this->archive);
}
archive_read_support_filter_all(archive);
archive_read_support_format_all(archive);
check(archive_read_open_filename(archive, path.c_str(), 16384), "failed to open archive: %s");
}
private:
void TarArchive::close() {
check(archive_read_close(this->archive), "Failed to close archive (%s)");
}
static int callback_open(struct archive *, void * self) {
return ARCHIVE_OK;
}
static ssize_t callback_read(struct archive * archive, void * _self, const void * * buffer)
{
auto self = (TarArchive *)_self;
*buffer = self->buffer.data();
try {
return self->source->read((char *) self->buffer.data(), 4096);
} catch (EndOfFile &) {
return 0;
} catch (std::exception & err) {
archive_set_error(archive, EIO, "source threw exception: %s", err.what());
return -1;
}
}
static int callback_close(struct archive *, void * self) {
return ARCHIVE_OK;
}
};
TarArchive::~TarArchive() {
if (this->archive) archive_read_free(this->archive);
}
static void extract_archive(TarArchive & archive, const Path & destDir)
{