summaryrefslogtreecommitdiff
path: root/ftparchive/contents.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2011-03-10 10:43:39 +0100
committerMichael Vogt <mvo@debian.org>2011-03-10 10:43:39 +0100
commite9ecab0f97be19326c52f2afe04fd9b44eba01ae (patch)
treead06841a04b112ca93e1ee0a29441214503ce3d2 /ftparchive/contents.cc
parent8315b8ccf3b23e5bf78a3ba70154ae721540950c (diff)
parent28166356f30ad13729f7f952e6f1fc6131036591 (diff)
merged from donkult
Diffstat (limited to 'ftparchive/contents.cc')
-rw-r--r--ftparchive/contents.cc27
1 files changed, 3 insertions, 24 deletions
diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index b761d9204..eadced626 100644
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -36,12 +36,13 @@
#include "contents.h"
#include <apti18n.h>
+#include <apt-pkg/debfile.h>
#include <apt-pkg/extracttar.h>
#include <apt-pkg/error.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <malloc.h>
+#include <malloc.h>
/*}}}*/
// GenContents::~GenContents - Free allocated memory /*{{{*/
@@ -305,29 +306,7 @@ void GenContents::DoPrint(FILE *Out,GenContents::Node *Top, char *Buf)
bool ContentsExtract::Read(debDebFile &Deb)
{
Reset();
-
- // Get the archive member and positition the file
- const ARArchive::Member *Member = Deb.GotoMember("data.tar.gz");
- const char *Compressor = "gzip";
- if (Member == 0) {
- Member = Deb.GotoMember("data.tar.bz2");
- Compressor = "bzip2";
- }
- if (Member == 0) {
- Member = Deb.GotoMember("data.tar.lzma");
- Compressor = "lzma";
- }
- if (Member == 0) {
- _error->Error(_("Internal error, could not locate member %s"),
- "data.tar.{gz,bz2,lzma}");
- return false;
- }
-
- // Extract it.
- ExtractTar Tar(Deb.GetFile(),Member->Size,Compressor);
- if (Tar.Go(*this) == false)
- return false;
- return true;
+ return Deb.ExtractArchive(*this);
}
/*}}}*/
// ContentsExtract::DoItem - Extract an item /*{{{*/