Merge remote-tracking branch 'upstream/master' into auto-uid-allocation

1 files changed, 22 insertions, 0 deletions

diff --git a/src/libutil/tarfile.hh b/src/libutil/tarfile.hh
index 89a024f1d..f107a7e2e 100644
--- a/src/libutil/tarfile.hh
+++ b/src/libutil/tarfile.hh
@@ -1,7 +1,29 @@
 #include "serialise.hh"
+#include <archive.h>
 
 namespace nix {
 
+struct TarArchive {
+    struct archive * archive;
+    Source * source;
+    std::vector<unsigned char> buffer;
+
+    void check(int err, const std::string & reason = "failed to extract archive (%s)");
+
+    TarArchive(Source & source, bool raw = false);
+
+    TarArchive(const Path & path);
+
+    // disable copy constructor
+    TarArchive(const TarArchive &) = delete;
+
+    void init();
+
+    void close();
+
+    ~TarArchive();
+};
+
 void unpackTarfile(Source & source, const Path & destDir);
 
 void unpackTarfile(const Path & tarFile, const Path & destDir);