X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b53c9cea2902572822bbbece5bac236c1bbf846e..27f38567fe327ecaf7fb361c3cca6ee29e6300c9:/apt-pkg/deb/debsrcrecords.cc

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 9404b6421..5454d79c3 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -33,9 +33,23 @@ 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) {}
-
+   : 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);
+   }
+}
+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
@@ -48,7 +62,7 @@ const char **debSrcRecordParser::Binaries()
    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;
 
@@ -60,13 +74,13 @@ const char **debSrcRecordParser::Binaries()
    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';
-      for (bin = binStartNext + 1; isspace(*bin) != 0; ++bin)
+      for (bin = binStartNext + 1; isspace_ascii(*bin) != 0; ++bin)
          ;
    } while (*bin != '\0');
    StaticBinList.push_back(NULL);
@@ -184,6 +198,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());
 
+	 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;
@@ -210,6 +233,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.Hashes.FileSize(F.FileSize);
 
 	 APT_IGNORE_DEPRECATED_PUSH
 	 F.Size = F.FileSize;
@@ -260,7 +284,7 @@ debSrcRecordParser::~debSrcRecordParser()
 
 
 debDscRecordParser::debDscRecordParser(std::string const &DscFile, pkgIndexFile const *Index)
-   : debSrcRecordParser(DscFile, Index)
+   : debSrcRecordParser("", Index)
 {
    // support clear signed files
    if (OpenMaybeClearSignedFile(DscFile, Fd) == false)
@@ -270,7 +294,7 @@ debDscRecordParser::debDscRecordParser(std::string const &DscFile, pkgIndexFile
    }
 
    // 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();