My "tolerance" patch was a tad bit overzealous :(.

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

diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index 8684f03f7c81b8823e331ae530971502a7987668..474fb1cbe94a02af2f315b5ca2c1c9c929d04792 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>
                                                                        /*}}}*/
 


@@ -107,7 +113,7 @@ bool debDebFile::ExtractTarMember(pkgDirStream &Stream,const char *Name)
       Member = AR.FindMember(std::string(Name).append(c->Extension).c_str());
       if (Member == NULL)
         continue;
       Member = AR.FindMember(std::string(Name).append(c->Extension).c_str());
       if (Member == NULL)
         continue;

-      Compressor = c->Binary;
+      Compressor = c->Name;

       break;
    }
 
       break;
    }
 


@@ -118,8 +124,10 @@ bool debDebFile::ExtractTarMember(pkgDirStream &Stream,const char *Name)
    {
       std::string ext = std::string(Name) + ".{";
       for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
    {
       std::string ext = std::string(Name) + ".{";
       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());
    }


@@ -195,7 +203,7 @@ 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. */
 bool debDebFile::MemControlExtract::Process(Item &/*Itm*/,const unsigned char *Data,
 /* 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)
+                            unsigned long long Size,unsigned long long Pos)

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


@@ -224,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];