wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 11:41:15 +02:00
Code Activity

Drop remaining uses of external "tar"

Browse source 
Also, fetchGit now runs in O(1) memory since we pipe the output of
'git archive' directly into unpackTarball() (rather than first reading
it all into memory).
This commit is contained in:
Eelco Dolstra 2019-09-11 15:25:43 +02:00
parent f2bd847092
commit 8918bae098
7 changed files with 43 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libutil/serialise.hh
View file

@ -77,7 +77,6 @@ struct BufferedSource : Source
size_t read(unsigned char * data, size_t len) override;
bool hasData();
protected:

22
src/libutil/tarfile.cc
View file

@ -1,4 +1,5 @@
#include "rust-ffi.hh"
#include "compression.hh"
extern "C" {
rust::CBox2<rust::Result<std::tuple<>>> unpack_tarfile(rust::Source source, rust::StringSlice dest_dir);
@ -6,9 +7,28 @@ extern "C" {
namespace nix {
void unpackTarfile(Source & source, Path destDir)
void unpackTarfile(Source & source, const Path & destDir)
{
unpack_tarfile(source, destDir).use()->unwrap();
}
void unpackTarfile(const Path & tarFile, const Path & destDir,
std::optional<std::string> baseName)
{
if (!baseName) baseName = baseNameOf(tarFile);
auto source = sinkToSource([&](Sink & sink) {
// FIXME: look at first few bytes to determine compression type.
auto decompressor =
// FIXME: add .gz support
hasSuffix(*baseName, ".bz2") ? makeDecompressionSink("bzip2", sink) :
hasSuffix(*baseName, ".xz") ? makeDecompressionSink("xz", sink) :
makeDecompressionSink("none", sink);
readFile(tarFile, *decompressor);
decompressor->finish();
});
unpackTarfile(*source, destDir);
}
}

5
src/libutil/tarfile.hh
View file

@ -2,6 +2,9 @@
namespace nix {
void unpackTarfile(Source & source, Path destDir);
void unpackTarfile(Source & source, const Path & destDir);
void unpackTarfile(const Path & tarFile, const Path & destDir,
std::optional<std::string> baseName = {});
}