implement Fallback-Of for IndexTargets

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

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 97f43aca2b54f8fda5210879a9dc6f4f2780824c..e8295debb0e146c287ef856a70645763515ba9aa 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -32,6 +32,16 @@
 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), Tags(&Fd), iOffset(0), Buffer(NULL)
+{
+   if (File.empty() == false)
+   {
+      if (Fd.Open(File, FileFd::ReadOnly, FileFd::Extension))
+        Tags.Init(&Fd, 102400);
+   }
+}
+

 // 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


@@ -44,7 +54,7 @@ const char **debSrcRecordParser::Binaries()
    const char *Start, *End;
    if (Sect.Find("Binary", Start, End) == false)
       return NULL;
    const char *Start, *End;
    if (Sect.Find("Binary", Start, End) == false)
       return NULL;

-   for (; isspace(*Start) != 0; ++Start);
+   for (; isspace_ascii(*Start) != 0; ++Start);

    if (Start >= End)
       return NULL;
 
    if (Start >= End)
       return NULL;
 


@@ -56,13 +66,13 @@ const char **debSrcRecordParser::Binaries()
    do {
       char* binStartNext = strchrnul(bin, ',');
       char* binEnd = binStartNext - 1;
    do {
       char* binStartNext = strchrnul(bin, ',');
       char* binEnd = binStartNext - 1;

-      for (; isspace(*binEnd) != 0; --binEnd)
+      for (; isspace_ascii(*binEnd) != 0; --binEnd)

         binEnd = 0;
       StaticBinList.push_back(bin);
       if (*binStartNext != ',')
         break;
       *binStartNext = '\0';
         binEnd = 0;
       StaticBinList.push_back(bin);
       if (*binStartNext != ',')
         break;
       *binStartNext = '\0';

-      for (bin = binStartNext + 1; isspace(*bin) != 0; ++bin)
+      for (bin = binStartNext + 1; isspace_ascii(*bin) != 0; ++bin)

          ;
    } while (*bin != '\0');
    StaticBinList.push_back(NULL);
          ;
    } while (*bin != '\0');
    StaticBinList.push_back(NULL);


@@ -121,9 +131,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)

 {
 {

-   List.erase(List.begin(),List.end());
+   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.clear();

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


@@ -162,7 +195,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 +203,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 +212,17 @@ 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);

+        F.Hashes.FileSize(F.FileSize);

 
 

-#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;


@@ -246,7 +267,7 @@ debSrcRecordParser::~debSrcRecordParser()
 
 
 debDscRecordParser::debDscRecordParser(std::string const &DscFile, pkgIndexFile const *Index)
 
 
 debDscRecordParser::debDscRecordParser(std::string const &DscFile, pkgIndexFile const *Index)

-   : debSrcRecordParser(DscFile, Index)
+   : debSrcRecordParser("", Index)

 {
    // support clear signed files
    if (OpenMaybeClearSignedFile(DscFile, Fd) == false)
 {
    // support clear signed files
    if (OpenMaybeClearSignedFile(DscFile, Fd) == false)


@@ -256,7 +277,7 @@ debDscRecordParser::debDscRecordParser(std::string const &DscFile, pkgIndexFile
    }
 
    // re-init to ensure the updated Fd is used
    }
 
    // re-init to ensure the updated Fd is used

-   Tags.Init(&Fd);
+   Tags.Init(&Fd, pkgTagFile::SUPPORT_COMMENTS);

    // read the first (and only) record
    Step();
 
    // read the first (and only) record
    Step();