debian/control: Set Standards-Version to 3.9.7

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

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index ca6d098967f38af7335835e6585dd291d50b1333..cefaf46acc84c59479227d248cdec5da40a98f55 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);


@@ -256,7 +266,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)


@@ -266,7 +276,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();