[ David Kalnischkies ]

[apt.git] / apt-pkg / deb / debsrcrecords.cc

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 9e87ee5dadc8293aa9b3caf9b7ce5afdff966165..749305005f46730ccdfbb110312a4890e585ce69 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -9,15 +9,12 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/debsrcrecords.h"
-#endif 
-

 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/debsrcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/debsrcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>

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

 
 using std::max;
                                                                        /*}}}*/
 
 using std::max;
                                                                        /*}}}*/


@@ -40,7 +37,7 @@ const char **debSrcRecordParser::Binaries()
    {
       delete [] Buffer;
       // allocate new size based on buffer (but never smaller than 4000)
    {
       delete [] Buffer;
       // allocate new size based on buffer (but never smaller than 4000)

-      BufSize = max((unsigned long)4000, max((unsigned long)Bins.length()+1,2*BufSize));
+      BufSize = max((unsigned int)4000, max((unsigned int)Bins.length()+1,2*BufSize));

       Buffer = new char[BufSize];
    }
 
       Buffer = new char[BufSize];
    }
 


@@ -58,7 +55,8 @@ const char **debSrcRecordParser::Binaries()
    package/version records representing the build dependency. The returned 
    array need not be freed and will be reused by the next call to this 
    function */
    package/version records representing the build dependency. The returned 
    array need not be freed and will be reused by the next call to this 
    function */

-bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps, bool ArchOnly)
+bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps,
+                                       bool const &ArchOnly, bool const &StripMultiArch)

 {
    unsigned int I;
    const char *Start, *Stop;
 {
    unsigned int I;
    const char *Start, *Stop;


@@ -81,7 +79,7 @@ bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec>
       while (1)
       {
          Start = debListParser::ParseDepends(Start, Stop, 
       while (1)
       {
          Start = debListParser::ParseDepends(Start, Stop, 

-                    rec.Package,rec.Version,rec.Op,true);
+                    rec.Package,rec.Version,rec.Op,true, StripMultiArch);

         
          if (Start == 0) 
             return _error->Error("Problem parsing dependency: %s", fields[I]);
         
          if (Start == 0) 
             return _error->Error("Problem parsing dependency: %s", fields[I]);


@@ -114,7 +112,9 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
    string Base = Sect.FindS("Directory");
    if (Base.empty() == false && Base[Base.length()-1] != '/')
       Base += '/';
    string Base = Sect.FindS("Directory");
    if (Base.empty() == false && Base[Base.length()-1] != '/')
       Base += '/';

-   
+
+   std::vector<std::string> const compExts = APT::Configuration::getCompressorExtensions();
+

    // Iterate over the entire list grabbing each triplet
    const char *C = Files.c_str();
    while (*C != 0)
    // Iterate over the entire list grabbing each triplet
    const char *C = Files.c_str();
    while (*C != 0)


@@ -139,9 +139,16 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
         string::size_type Tmp = F.Path.rfind('.',Pos);
         if (Tmp == string::npos)
            break;
         string::size_type Tmp = F.Path.rfind('.',Pos);
         if (Tmp == string::npos)
            break;

+        if (F.Type == "tar") {
+           // source v3 has extension 'debian.tar.*' instead of 'diff.*'
+           if (string(F.Path, Tmp+1, Pos-Tmp) == "debian")
+              F.Type = "diff";
+           break;
+        }

         F.Type = string(F.Path,Tmp+1,Pos-Tmp);
         
         F.Type = string(F.Path,Tmp+1,Pos-Tmp);
         

-        if (F.Type == "gz" || F.Type == "bz2")
+        if (std::find(compExts.begin(), compExts.end(), std::string(".").append(F.Type)) != compExts.end() ||
+            F.Type == "tar")

         {
            Pos = Tmp-1;
            continue;
         {
            Pos = Tmp-1;
            continue;


@@ -156,3 +163,11 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+// SrcRecordParser::~SrcRecordParser - Destructor                      /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+debSrcRecordParser::~debSrcRecordParser()
+{
+   delete[] Buffer;
+}
+                                                                       /*}}}*/