add insecure (and weak) allow-options for sources.list

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

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 21a4ff8ea29190dfc5e721e6e530b08ce88af147..e8295debb0e146c287ef856a70645763515ba9aa 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -33,8 +33,14 @@ using std::max;
 using std::string;
 
 debSrcRecordParser::debSrcRecordParser(std::string const &File,pkgIndexFile const *Index)
-   : Parser(Index), 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);
+   }
+}
 
 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/
 // ---------------------------------------------------------------------
@@ -48,7 +54,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 +66,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);
@@ -210,6 +216,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 +267,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 +277,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();