test framework: Correctly generate new paths in noopchroot

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

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 76ba670c6f4d2ff481eb54d95e5356e5371eb9f5..9404b64215fee4584d26b358b811d29871aa1324 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -32,6 +32,10 @@
 using std::max;
 using std::string;
 
 using std::max;
 using std::string;
 

+debSrcRecordParser::debSrcRecordParser(std::string const &File,pkgIndexFile const *Index)
+   : Parser(Index), d(NULL), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400),
+   iOffset(0), Buffer(NULL) {}
+

 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/
 // ---------------------------------------------------------------------
 /* This member parses the binaries field into a pair of class arrays and
 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/
 // ---------------------------------------------------------------------
 /* This member parses the binaries field into a pair of class arrays and


@@ -121,9 +125,32 @@ bool debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDe
 // ---------------------------------------------------------------------
 /* This parses the list of files and returns it, each file is required to have
    a complete source package */
 // ---------------------------------------------------------------------
 /* This parses the list of files and returns it, each file is required to have
    a complete source package */

-bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
+bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &F)
+{
+   std::vector<pkgSrcRecords::File2> F2;
+   if (Files2(F2) == false)
+      return false;
+   for (std::vector<pkgSrcRecords::File2>::const_iterator f2 = F2.begin(); f2 != F2.end(); ++f2)
+   {
+      pkgSrcRecords::File2 f;
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic push
+       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+      f.MD5Hash = f2->MD5Hash;
+      f.Size = f2->Size;
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic pop
+#endif
+      f.Path = f2->Path;
+      f.Type = f2->Type;
+      F.push_back(f);
+   }
+   return true;
+}
+bool debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2> &List)

 {
 {

-   List.erase(List.begin(),List.end());
+   List.clear();

 
    // Stash the / terminated directory prefix
    string Base = Sect.FindS("Directory");
 
    // Stash the / terminated directory prefix
    string Base = Sect.FindS("Directory");


@@ -162,7 +189,7 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
            path = Base + path;
 
         // look if we have a record for this file already
            path = Base + path;
 
         // look if we have a record for this file already

-        std::vector<pkgSrcRecords::File>::iterator file = List.begin();
+        std::vector<pkgSrcRecords::File2>::iterator file = List.begin();

         for (; file != List.end(); ++file)
            if (file->Path == path)
               break;
         for (; file != List.end(); ++file)
            if (file->Path == path)
               break;


@@ -170,16 +197,8 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
         // we have it already, store the new hash and be done
         if (file != List.end())
         {
         // we have it already, store the new hash and be done
         if (file != List.end())
         {

-#if __GNUC__ >= 4
-       // set for compatibility only, so warn users not us
-       #pragma GCC diagnostic push
-       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif

            if (checksumField == "Files")
            if (checksumField == "Files")

-              file->MD5Hash = hash;
-#if __GNUC__ >= 4
-       #pragma GCC diagnostic pop
-#endif
+              APT_IGNORE_DEPRECATED(file->MD5Hash = hash;)

            // an error here indicates that we have two different hashes for the same file
            if (file->Hashes.push_back(hashString) == false)
               return _error->Error("Error parsing checksum in %s of source package %s", checksumField.c_str(), Package().c_str());
            // an error here indicates that we have two different hashes for the same file
            if (file->Hashes.push_back(hashString) == false)
               return _error->Error("Error parsing checksum in %s of source package %s", checksumField.c_str(), Package().c_str());


@@ -187,21 +206,16 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
         }
 
         // we haven't seen this file yet
         }
 
         // we haven't seen this file yet

-        pkgSrcRecords::File F;
+        pkgSrcRecords::File2 F;

         F.Path = path;
         F.Path = path;

-        F.Size = strtoull(size.c_str(), NULL, 10);
+        F.FileSize = strtoull(size.c_str(), NULL, 10);

         F.Hashes.push_back(hashString);
 
         F.Hashes.push_back(hashString);
 

-#if __GNUC__ >= 4
-       // set for compatibility only, so warn users not us
-       #pragma GCC diagnostic push
-       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+        APT_IGNORE_DEPRECATED_PUSH
+        F.Size = F.FileSize;

         if (checksumField == "Files")
            F.MD5Hash = hash;
         if (checksumField == "Files")
            F.MD5Hash = hash;

-#if __GNUC__ >= 4
-       #pragma GCC diagnostic pop
-#endif
+        APT_IGNORE_DEPRECATED_POP

 
         // Try to guess what sort of file it is we are getting.
         string::size_type Pos = F.Path.length()-1;
 
         // Try to guess what sort of file it is we are getting.
         string::size_type Pos = F.Path.length()-1;


@@ -239,7 +253,8 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
 /* */
 debSrcRecordParser::~debSrcRecordParser()
 {
 /* */
 debSrcRecordParser::~debSrcRecordParser()
 {

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

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