support long keyid and fingerprint in gpgv's GOODSIG

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

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index cefaf46acc84c59479227d248cdec5da40a98f55..d296161d6aad203c1dff8ce18fe826f3851b6088 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -41,7 +41,15 @@ debSrcRecordParser::debSrcRecordParser(std::string const &File,pkgIndexFile cons
         Tags.Init(&Fd, 102400);
    }
 }
         Tags.Init(&Fd, 102400);
    }
 }

-
+std::string debSrcRecordParser::Package() const                                /*{{{*/
+{
+   auto const name = Sect.FindS("Package");
+   if (iIndex == nullptr)
+      return name.empty() ? Sect.FindS("Source") : name;
+   else
+      return name;
+}
+                                                                       /*}}}*/

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


@@ -65,9 +73,12 @@ const char **debSrcRecordParser::Binaries()
    char* bin = Buffer;
    do {
       char* binStartNext = strchrnul(bin, ',');
    char* bin = Buffer;
    do {
       char* binStartNext = strchrnul(bin, ',');

-      char* binEnd = binStartNext - 1;
-      for (; isspace_ascii(*binEnd) != 0; --binEnd)
-        binEnd = 0;
+      // Found a comma, clean up any space before it
+      if (binStartNext > Buffer) {
+        char* binEnd = binStartNext - 1;
+        for (; binEnd > Buffer && isspace_ascii(*binEnd) != 0; --binEnd)
+           *binEnd = 0;
+      }

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


@@ -190,6 +201,15 @@ bool debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2> &List)
               ParseQuoteWord(C, path) == false)
            return _error->Error("Error parsing file record in %s of source package %s", checksumField.c_str(), Package().c_str());
 
               ParseQuoteWord(C, path) == false)
            return _error->Error("Error parsing file record in %s of source package %s", checksumField.c_str(), Package().c_str());
 

+        if (iIndex == nullptr && checksumField == "Files")
+        {
+           // the Files field has a different format than the rest in deb-changes files
+           std::string ignore;
+           if (ParseQuoteWord(C, ignore) == false ||
+                 ParseQuoteWord(C, path) == false)
+              return _error->Error("Error parsing file record in %s of source package %s", checksumField.c_str(), Package().c_str());
+        }
+

         HashString const hashString(*type, hash);
         if (Base.empty() == false)
            path = Base + path;
         HashString const hashString(*type, hash);
         if (Base.empty() == false)
            path = Base + path;


@@ -216,6 +236,7 @@ bool debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2> &List)
         F.Path = path;
         F.FileSize = strtoull(size.c_str(), NULL, 10);
         F.Hashes.push_back(hashString);
         F.Path = path;
         F.FileSize = strtoull(size.c_str(), NULL, 10);
         F.Hashes.push_back(hashString);

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

 
         APT_IGNORE_DEPRECATED_PUSH
         F.Size = F.FileSize;
 
         APT_IGNORE_DEPRECATED_PUSH
         F.Size = F.FileSize;