releasing package apt version 1.0.5

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

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index ce55ccd1f03e298b8f9e1fba8a3130bc5e22f61b..a444cbe4d59038c86660efa94cc0d110e5bc644f 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -15,12 +15,19 @@
 #include <apt-pkg/debsrcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.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>
 #include <apt-pkg/aptconfiguration.h>

+#include <apt-pkg/srcrecords.h>
+#include <apt-pkg/tagfile.h>

 
 

-using std::max;
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+#include <string>
+#include <vector>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

+using std::max;

 using std::string;
 
 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/
 using std::string;
 
 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/


@@ -57,7 +64,7 @@ const char **debSrcRecordParser::Binaries()
    } while (*bin != '\0');
    StaticBinList.push_back(NULL);
 
    } while (*bin != '\0');
    StaticBinList.push_back(NULL);
 

-   return (const char **) &StaticBinList[0];
+   return &StaticBinList[0];

 }
                                                                        /*}}}*/
 // SrcRecordParser::BuildDepends - Return the Build-Depends information        /*{{{*/
 }
                                                                        /*}}}*/
 // SrcRecordParser::BuildDepends - Return the Build-Depends information        /*{{{*/


@@ -90,7 +97,7 @@ bool debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDe
       while (1)
       {
          Start = debListParser::ParseDepends(Start, Stop, 
       while (1)
       {
          Start = debListParser::ParseDepends(Start, Stop, 

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

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


@@ -179,6 +186,7 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
 /* */
 debSrcRecordParser::~debSrcRecordParser()
 {
 /* */
 debSrcRecordParser::~debSrcRecordParser()
 {

-   delete[] Buffer;
+   // was allocated via strndup()
+   free(Buffer);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/