Switch performance critical code to use APT::StringView

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

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 49a348dd4e9ebe7fe66447176a523c7de2ac8593..cefaf46acc84c59479227d248cdec5da40a98f55 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -18,6 +18,8 @@
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/tagfile.h>

+#include <apt-pkg/hashes.h>
+#include <apt-pkg/gpgv.h>

 
 #include <ctype.h>
 #include <stdlib.h>
 
 #include <ctype.h>
 #include <stdlib.h>


@@ -30,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


@@ -42,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;
 


@@ -54,13 +66,14 @@ 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)
-        binEnd = '\0';
+      for (; isspace_ascii(*binEnd) != 0; --binEnd)
+        binEnd = 0;

       StaticBinList.push_back(bin);
       if (*binStartNext != ',')
         break;
       *binStartNext = '\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);
 


@@ -190,16 +203,8 @@ bool debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2> &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());


@@ -212,17 +217,11 @@ bool debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2> &List)
         F.FileSize = strtoull(size.c_str(), NULL, 10);
         F.Hashes.push_back(hashString);
 
         F.FileSize = strtoull(size.c_str(), NULL, 10);
         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;
         F.Size = F.FileSize;
         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;


@@ -264,3 +263,21 @@ debSrcRecordParser::~debSrcRecordParser()
    free(Buffer);
 }
                                                                        /*}}}*/
    free(Buffer);
 }
                                                                        /*}}}*/

+
+
+debDscRecordParser::debDscRecordParser(std::string const &DscFile, pkgIndexFile const *Index)
+   : debSrcRecordParser("", Index)
+{
+   // support clear signed files
+   if (OpenMaybeClearSignedFile(DscFile, Fd) == false)
+   {
+      _error->Error("Failed to open %s", DscFile.c_str());
+      return;
+   }
+
+   // re-init to ensure the updated Fd is used
+   Tags.Init(&Fd, pkgTagFile::SUPPORT_COMMENTS);
+   // read the first (and only) record
+   Step();
+
+}