add an additional test for arch specific conflicts

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

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index dc4c110a122fbbd0261c808f8039bd7c4325f14b..e4428e05154e26ad2b4cef7d36a0423965702242 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -18,35 +18,34 @@
 #include <apt-pkg/init.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/pkgcache.h>

+#include <apt-pkg/cacheiterators.h>

 #include <apt-pkg/configuration.h>
 #include <apt-pkg/configuration.h>

-#include <apt-pkg/progress.h>

 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/sourcelist.h>
 #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>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgsystem.h>

+#include <apt-pkg/dirstream.h>
+#include <apt-pkg/mmap.h>

 
 

+#include <iostream>

 #include <stdio.h>
 #include <string.h>
 #include <stdio.h>
 #include <string.h>

-#include <stdlib.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <fstream>
+#include <stdlib.h>

 
 

-#include <locale.h>
-#include <apti18n.h>

 #include "apt-extracttemplates.h"
 #include "apt-extracttemplates.h"

+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 using namespace std;
 
                                                                        /*}}}*/
 
 using namespace std;
 

-#define TMPDIR         "/tmp"
-

 pkgCache *DebFile::Cache = 0;
 
 // DebFile::DebFile - Construct the DebFile object                     /*{{{*/
 pkgCache *DebFile::Cache = 0;
 
 // DebFile::DebFile - Construct the DebFile object                     /*{{{*/


@@ -91,18 +90,9 @@ string DebFile::GetInstalledVer(const string &package)
 /* */
 bool DebFile::Go()
 {
 /* */
 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                 /*{{{*/
 }
                                                                        /*}}}*/
 // DebFile::DoItem examine element in package and mark                 /*{{{*/


@@ -147,7 +137,7 @@ bool DebFile::DoItem(Item &I, int &Fd)
 // DebFile::Process examine element in package and copy                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // DebFile::Process examine element in package and copy                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool DebFile::Process(Item &I, const unsigned char *data, 
+bool DebFile::Process(Item &/*I*/, const unsigned char *data,

                unsigned long size, unsigned long pos)
 {
        switch (Which)
                unsigned long size, unsigned long pos)
 {
        switch (Which)


@@ -222,9 +212,9 @@ bool DebFile::ParseInfo()
 // ShowHelp - show a short help text                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowHelp - show a short help text                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-int ShowHelp(void)
+static int ShowHelp(void)

 {
 {

-       ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+       ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,

            COMMON_ARCH,__DATE__,__TIME__);
 
        if (_config->FindB("version") == true) 
            COMMON_ARCH,__DATE__,__TIME__);
 
        if (_config->FindB("version") == true) 


@@ -247,29 +237,28 @@ int ShowHelp(void)
 // WriteFile - write the contents of the passed string to a file       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // WriteFile - write the contents of the passed string to a file       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-string WriteFile(const char *package, const char *prefix, const char *data)
+static string WriteFile(const char *package, const char *prefix, const char *data)

 {
        char fn[512];
 {
        char fn[512];

-       static int i;
-       const char *tempdir = NULL;

 
 

-        tempdir = getenv("TMPDIR");
-        if (tempdir == NULL)
-             tempdir = TMPDIR;
-
-       snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d",
-                 _config->Find("APT::ExtractTemplates::TempDir", tempdir).c_str(),
-                 package, prefix, getpid(), i++);
+        std::string tempdir = GetTempDir();
+       snprintf(fn, sizeof(fn), "%s/%s.%s.XXXXXX",
+                 _config->Find("APT::ExtractTemplates::TempDir", 
+                               tempdir.c_str()).c_str(),
+                 package, prefix);

        FileFd f;
        if (data == NULL)
                data = "";
        FileFd f;
        if (data == NULL)
                data = "";

-
-       if (!f.Open(fn, FileFd::WriteTemp, 0600))
+        int fd = mkstemp(fn);
+        if (fd < 0) {
+               _error->Errno("ofstream::ofstream",_("Unable to mkstemp %s"),fn);
+                return string();
+        }
+       if (!f.OpenDescriptor(fd, FileFd::WriteOnly, FileFd::None, true))

        {
                _error->Errno("ofstream::ofstream",_("Unable to write to %s"),fn);
                return string();
        }
        {
                _error->Errno("ofstream::ofstream",_("Unable to write to %s"),fn);
                return string();
        }

-

        f.Write(data, strlen(data));
        f.Close();
        return fn;
        f.Write(data, strlen(data));
        f.Close();
        return fn;


@@ -278,7 +267,7 @@ string WriteFile(const char *package, const char *prefix, const char *data)
 // WriteConfig - write out the config data from a debian package file  /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // WriteConfig - write out the config data from a debian package file  /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void WriteConfig(const DebFile &file)
+static void WriteConfig(const DebFile &file)

 {
        string templatefile = WriteFile(file.Package.c_str(), "template", file.Template);
        string configscript = WriteFile(file.Package.c_str(), "config", file.Config);
 {
        string templatefile = WriteFile(file.Package.c_str(), "template", file.Template);
        string configscript = WriteFile(file.Package.c_str(), "config", file.Config);


@@ -292,7 +281,7 @@ void WriteConfig(const DebFile &file)
 // InitCache - initialize the package cache                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // InitCache - initialize the package cache                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool Go(CommandLine &CmdL)
+static bool Go(CommandLine &CmdL)

 {      
        // Initialize the apt cache
        MMap *Map = 0;
 {      
        // Initialize the apt cache
        MMap *Map = 0;