Add support for data.tar, control.tar and control.tar.xz

[apt.git] / cmdline / apt-extracttemplates.cc

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 60efafba544283d9b0ee0c569abfab0297bbe2f1..2408a7d9d8f333b94dcdc84e005aa0b557b75466 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -24,8 +24,7 @@
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/tagfile.h>
-#include <apt-pkg/extracttar.h>
-#include <apt-pkg/arfile.h>
+#include <apt-pkg/debfile.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
@@ -36,17 +35,17 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <locale.h>
+
 #include <fstream>
 
-#include <locale.h>
-#include <apti18n.h>
 #include "apt-extracttemplates.h"
+
+#include <apti18n.h>
                                                                        /*}}}*/
 
 using namespace std;
 
-#define TMPDIR         "/tmp"
-
 pkgCache *DebFile::Cache = 0;
 
 // DebFile::DebFile - Construct the DebFile object                     /*{{{*/
@@ -91,18 +90,9 @@ string DebFile::GetInstalledVer(const string &package)
 /* */
 bool DebFile::Go()
 {
-       ARArchive AR(File);
-       if (_error->PendingError() == true)
-               return false;
-               
-       const ARArchive::Member *Member = AR.FindMember("control.tar.gz");
-       if (Member == 0)
-               return _error->Error(_("%s not a valid DEB package."),File.Name().c_str());
-       
-       if (File.Seek(Member->Start) == false)
-               return false;
-       ExtractTar Tar(File, Member->Size,"gzip");
-       return Tar.Go(*this);
+       debDebFile Deb(File);
+
+       return Deb.ExtractTarMember(*this, "control.tar");
 }
                                                                        /*}}}*/
 // DebFile::DoItem examine element in package and mark                 /*{{{*/
@@ -251,14 +241,11 @@ string WriteFile(const char *package, const char *prefix, const char *data)
 {
        char fn[512];
        static int i;
-       const char *tempdir = NULL;
-
-        tempdir = getenv("TMPDIR");
-        if (tempdir == NULL)
-             tempdir = TMPDIR;
 
+        std::string tempdir = GetTempDir();
        snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d",
-                 _config->Find("APT::ExtractTemplates::TempDir", tempdir).c_str(),
+                 _config->Find("APT::ExtractTemplates::TempDir", 
+                               tempdir.c_str()).c_str(),
                  package, prefix, getpid(), i++);
        FileFd f;
        if (data == NULL)