don't try to get acquire lock in simulation mode

[apt.git] / apt-inst / deb / debfile.cc

diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index 79434d8b563c06b1ac3e0929d843ae644ee90ade..4853a13c7ebd3c404a467da40b75ba8c0a11757f 100644 (file)
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -21,11 +21,17 @@
 #include <apt-pkg/debfile.h>
 #include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/debfile.h>
 #include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>

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

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

-
+#include <apt-pkg/arfile.h>
+#include <apt-pkg/dirstream.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/tagfile.h>
+
+#include <string.h>
+#include <string>
+#include <vector>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <unistd.h>
+

 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 


@@ -42,12 +48,15 @@ debDebFile::debDebFile(FileFd &File) : File(File), AR(File)
       return;
    }
 
       return;
    }
 

-   if (!CheckMember("control.tar.gz")) {
-      _error->Error(_("This is not a valid DEB archive, missing '%s' member"), "control.tar.gz");
+   if (!CheckMember("control.tar") &&
+       !CheckMember("control.tar.gz") &&
+       !CheckMember("control.tar.xz")) {
+      _error->Error(_("This is not a valid DEB archive, missing '%s' member"), "control.tar");

       return;
    }
 
       return;
    }
 

-   if (!CheckMember("data.tar.gz") &&
+   if (!CheckMember("data.tar") &&
+       !CheckMember("data.tar.gz") &&

        !CheckMember("data.tar.bz2") &&
        !CheckMember("data.tar.lzma") &&
        !CheckMember("data.tar.xz")) {
        !CheckMember("data.tar.bz2") &&
        !CheckMember("data.tar.lzma") &&
        !CheckMember("data.tar.xz")) {


@@ -88,33 +97,37 @@ const ARArchive::Member *debDebFile::GotoMember(const char *Name)
    return Member;
 }
                                                                        /*}}}*/
    return Member;
 }
                                                                        /*}}}*/

-// DebFile::ExtractArchive - Extract the archive data itself           /*{{{*/
+// DebFile::ExtractTarMember - Extract the contents of a tar member    /*{{{*/

 // ---------------------------------------------------------------------
 /* Simple wrapper around tar.. */
 // ---------------------------------------------------------------------
 /* Simple wrapper around tar.. */

-bool debDebFile::ExtractArchive(pkgDirStream &Stream)
+bool debDebFile::ExtractTarMember(pkgDirStream &Stream,const char *Name)

 {
    // Get the archive member
    const ARArchive::Member *Member = NULL;
    std::string Compressor;
 
 {
    // Get the archive member
    const ARArchive::Member *Member = NULL;
    std::string Compressor;
 

-   std::string const data = "data.tar";

    std::vector<APT::Configuration::Compressor> compressor = APT::Configuration::getCompressors();
    for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
        c != compressor.end(); ++c)
    {
    std::vector<APT::Configuration::Compressor> compressor = APT::Configuration::getCompressors();
    for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
        c != compressor.end(); ++c)
    {

-      Member = AR.FindMember(std::string(data).append(c->Extension).c_str());
+      Member = AR.FindMember(std::string(Name).append(c->Extension).c_str());

       if (Member == NULL)
         continue;
       Compressor = c->Binary;
       break;
    }
 
       if (Member == NULL)
         continue;
       Compressor = c->Binary;
       break;
    }
 

+   if (Member == NULL)
+      Member = AR.FindMember(std::string(Name).c_str());
+

    if (Member == NULL)
    {
    if (Member == NULL)
    {

-      std::string ext = "data.tar.{";
+      std::string ext = std::string(Name) + ".{";

       for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
       for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();

-          c != compressor.end(); ++c)
-        ext.append(c->Extension.substr(1));
+          c != compressor.end(); ++c) {
+        if (!c->Extension.empty())
+           ext.append(c->Extension.substr(1));
+      }

       ext.append("}");
       return _error->Error(_("Internal error, could not locate member %s"), ext.c_str());
    }
       ext.append("}");
       return _error->Error(_("Internal error, could not locate member %s"), ext.c_str());
    }


@@ -129,6 +142,14 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream)
    return Tar.Go(Stream);
 }
                                                                        /*}}}*/
    return Tar.Go(Stream);
 }
                                                                        /*}}}*/

+// DebFile::ExtractArchive - Extract the archive data itself           /*{{{*/
+// ---------------------------------------------------------------------
+/* Simple wrapper around DebFile::ExtractTarMember. */
+bool debDebFile::ExtractArchive(pkgDirStream &Stream)
+{
+   return ExtractTarMember(Stream, "data.tar");
+}
+                                                                       /*}}}*/

 
 // DebFile::ControlExtract::DoItem - Control Tar Extraction            /*{{{*/
 // ---------------------------------------------------------------------
 
 // DebFile::ControlExtract::DoItem - Control Tar Extraction            /*{{{*/
 // ---------------------------------------------------------------------


@@ -181,8 +202,8 @@ bool debDebFile::MemControlExtract::DoItem(Item &Itm,int &Fd)
 // ---------------------------------------------------------------------
 /* Just memcopy the block from the tar extractor and put it in the right
    place in the pre-allocated memory block. */
 // ---------------------------------------------------------------------
 /* Just memcopy the block from the tar extractor and put it in the right
    place in the pre-allocated memory block. */

-bool debDebFile::MemControlExtract::Process(Item &Itm,const unsigned char *Data,
-                            unsigned long Size,unsigned long Pos)
+bool debDebFile::MemControlExtract::Process(Item &/*Itm*/,const unsigned char *Data,
+                            unsigned long long Size,unsigned long long Pos)

 {
    memcpy(Control + Pos, Data,Size);
    return true;
 {
    memcpy(Control + Pos, Data,Size);
    return true;


@@ -194,14 +215,7 @@ bool debDebFile::MemControlExtract::Process(Item &Itm,const unsigned char *Data,
    it parses it into a tag section parser. */
 bool debDebFile::MemControlExtract::Read(debDebFile &Deb)
 {
    it parses it into a tag section parser. */
 bool debDebFile::MemControlExtract::Read(debDebFile &Deb)
 {

-   // Get the archive member and positition the file 
-   const ARArchive::Member *Member = Deb.GotoMember("control.tar.gz");
-   if (Member == 0)
-      return false;
-
-   // Extract it.
-   ExtractTar Tar(Deb.GetFile(),Member->Size,"gzip");
-   if (Tar.Go(*this) == false)
+   if (Deb.ExtractTarMember(*this, "control.tar") == false)

       return false;
 
    if (Control == 0)
       return false;
 
    if (Control == 0)


@@ -218,7 +232,7 @@ bool debDebFile::MemControlExtract::Read(debDebFile &Deb)
 // ---------------------------------------------------------------------
 /* The given memory block is loaded into the parser and parsed as a control
    record. */
 // ---------------------------------------------------------------------
 /* The given memory block is loaded into the parser and parsed as a control
    record. */

-bool debDebFile::MemControlExtract::TakeControl(const void *Data,unsigned long Size)
+bool debDebFile::MemControlExtract::TakeControl(const void *Data,unsigned long long Size)

 {
    delete [] Control;
    Control = new char[Size+2];
 {
    delete [] Control;
    Control = new char[Size+2];