This is 2016 and APT already requires use of mmap.

8 files changed, 84 insertions, 393 deletions

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index bb3bc1b56..ce5534681 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -3782,7 +3782,7 @@ std::string pkgAcqChangelog::URITemplate(pkgCache::RlsFileIterator const &Rls)
 	 should be so this could produce request order-dependent anomalies */
       if (OpenMaybeClearSignedFile(Rls.FileName(), rf) == true)
       {
-	 pkgTagFile TagFile(&rf, rf.Size());
+	 pkgTagFile TagFile(&rf);
 	 pkgTagSection Section;
 	 if (TagFile.Step(Section) == true)
 	    server = Section.FindS("Changelogs");
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 26331291c..12b7b709c 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -428,7 +428,7 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro
    if (OpenMaybeClearSignedFile(Filename, Fd) == false)
       return false;
 
-   pkgTagFile TagFile(&Fd, Fd.Size());
+   pkgTagFile TagFile(&Fd);
    if (Fd.IsOpen() == false || Fd.Failed())
    {
       if (ErrorText != NULL)
@@ -896,7 +896,7 @@ bool debReleaseIndex::Merge(pkgCacheGenerator &Gen,OpProgress * /*Prog*/) const/
    File->Size = Buf.st_size;
    File->mtime = Buf.st_mtime;
 
-   pkgTagFile TagFile(&Rel, Rel.Size());
+   pkgTagFile TagFile(&Rel);
    pkgTagSection Section;
    if (Rel.IsOpen() == false || Rel.Failed() || TagFile.Step(Section) == false)
       return false;
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 0fcb9987e..62e13c842 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -33,7 +33,7 @@ using std::string;
 // RecordParser::debRecordParser - Constructor				/*{{{*/
 debRecordParser::debRecordParser(string FileName,pkgCache &Cache) :
    debRecordParserBase(), d(NULL), File(FileName, FileFd::ReadOnly, FileFd::Extension),
-   Tags(&File, std::max(Cache.Head().MaxVerFileSize, Cache.Head().MaxDescFileSize) + 200)
+   Tags(&File)
 {
 }
 									/*}}}*/
@@ -230,7 +230,7 @@ bool debDebFileRecordParser::LoadContent()
    content << "\n\n";
 
    controlContent = content.str();
-   if (Section.Scan(controlContent.c_str(), controlContent.length()) == false)
+   if (Section.Scan(controlContent.c_str(), controlContent.length(), false) == false)
       return _error->Error(_("Unable to parse package file %s (%d)"), debFileName.c_str(), 3);
    return true;
 }
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 9656fcac3..3c025aae6 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -38,7 +38,7 @@ debSrcRecordParser::debSrcRecordParser(std::string const &File,pkgIndexFile cons
    if (File.empty() == false)
    {
       if (Fd.Open(File, FileFd::ReadOnly, FileFd::Extension))
-	 Tags.Init(&Fd, 102400);
+	 Tags.Init(&Fd);
    }
 }
 std::string debSrcRecordParser::Package() const				/*{{{*/
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 2e39be377..532d2684d 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -628,7 +628,7 @@ bool EDSP::ReadResponse(int const input, pkgDepCache &Cache, OpProgress *Progres
 
 	FileFd in;
 	in.OpenDescriptor(input, FileFd::ReadOnly, true);
-	pkgTagFile response(&in, 100);
+	pkgTagFile response(&in);
 	pkgTagSection section;
 
 	std::set<decltype(Cache.PkgBegin()->ID)> seenOnce;
@@ -1336,7 +1336,7 @@ bool EIPP::ReadResponse(int const input, pkgPackageManager * const PM, OpProgres
 
    FileFd in;
    in.OpenDescriptor(input, FileFd::ReadOnly);
-   pkgTagFile response(&in, 100);
+   pkgTagFile response(&in);
    pkgTagSection section;
 
    while (response.Step(section) == true) {
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 919172f89..34cd721c6 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -12,6 +12,9 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/tagfile-keys.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/string_view.h>
@@ -36,10 +39,11 @@ using APT::StringView;
 class APT_HIDDEN pkgTagFilePrivate					/*{{{*/
 {
 public:
-   void Reset(FileFd * const pFd, unsigned long long const pSize, pkgTagFile::Flags const pFlags)
+   void Reset(FileFd * const pFd, pkgTagFile::Flags const pFlags)
    {
-      if (Buffer != NULL)
-	 free(Buffer);
+      if (Map != NULL)
+         delete Map;
+      Map = NULL;
       Buffer = NULL;
       Fd = pFd;
       Flags = pFlags;
@@ -47,14 +51,11 @@ public:
       End = NULL;
       Done = false;
       iOffset = 0;
-      Size = pSize;
-      isCommentedLine = false;
-      chunks.clear();
    }
 
-   pkgTagFilePrivate(FileFd * const pFd, unsigned long long const Size, pkgTagFile::Flags const pFlags) : Buffer(NULL)
+   pkgTagFilePrivate(FileFd * const pFd, pkgTagFile::Flags const pFlags) : Map(NULL)
    {
-      Reset(pFd, Size, pFlags);
+      Reset(pFd, pFlags);
    }
    FileFd * Fd;
    pkgTagFile::Flags Flags;
@@ -63,20 +64,12 @@ public:
    char *End;
    bool Done;
    unsigned long long iOffset;
-   unsigned long long Size;
-   bool isCommentedLine;
-   struct FileChunk
-   {
-      bool const good;
-      size_t length;
-      FileChunk(bool const pgood, size_t const plength) : good(pgood), length(plength) {}
-   };
-   std::list<FileChunk> chunks;
+   MMap *Map;
 
    ~pkgTagFilePrivate()
    {
-      if (Buffer != NULL)
-	 free(Buffer);
+      if (Map != NULL)
+         delete Map;
    }
 };
 									/*}}}*/
@@ -115,42 +108,38 @@ static unsigned long BetaHash(const char *Text, size_t Length)		/*{{{*/
 									/*}}}*/
 
 // TagFile::pkgTagFile - Constructor					/*{{{*/
-pkgTagFile::pkgTagFile(FileFd * const pFd,pkgTagFile::Flags const pFlags, unsigned long long const Size)
-   : d(new pkgTagFilePrivate(pFd, Size + 4, pFlags))
+pkgTagFile::pkgTagFile(FileFd * const pFd,pkgTagFile::Flags const pFlags)
+   : d(new pkgTagFilePrivate(pFd, pFlags))
 {
-   Init(pFd, pFlags, Size);
+   Init(pFd, pFlags);
 }
-pkgTagFile::pkgTagFile(FileFd * const pFd,unsigned long long const Size)
-   : pkgTagFile(pFd, pkgTagFile::STRICT, Size)
+pkgTagFile::pkgTagFile(FileFd * const pFd)
+   : pkgTagFile(pFd, pkgTagFile::STRICT)
 {
 }
-void pkgTagFile::Init(FileFd * const pFd, pkgTagFile::Flags const pFlags, unsigned long long Size)
+void pkgTagFile::Init(FileFd * const pFd, pkgTagFile::Flags const pFlags)
 {
-   /* The size is increased by 4 because if we start with the Size of the
-      filename we need to try to read 1 char more to see an EOF faster, 1
-      char the end-pointer can be on and maybe 2 newlines need to be added
-      to the end of the file -> 4 extra chars */
-   Size += 4;
-   d->Reset(pFd, Size, pFlags);
-
-   if (d->Fd->IsOpen() == false)
-      d->Start = d->End = d->Buffer = 0;
-   else
-      d->Buffer = (char*)malloc(sizeof(char) * Size);
+   d->Reset(pFd, pFlags);
+
+   if (d->Fd->IsOpen() == false || d->Fd->Size() == 0)
+      _error->Discard();
+   else {
+      d->Map = new MMap(*d->Fd, MMap::ReadOnly);
+      d->Buffer = static_cast<char *>(d->Map->Data());
+   }
 
    if (d->Buffer == NULL)
       d->Done = true;
-   else
+   else {
       d->Done = false;
+      d->End = d->Buffer + d->Map->Size();
+   }
 
-   d->Start = d->End = d->Buffer;
-   d->iOffset = 0;
-   if (d->Done == false)
-      Fill();
+   d->Start = d->Buffer;
 }
-void pkgTagFile::Init(FileFd * const pFd,unsigned long long Size)
+void pkgTagFile::Init(FileFd * const pFd)
 {
-   Init(pFd, pkgTagFile::STRICT, Size);
+   Init(pFd, pkgTagFile::STRICT);
 }
 									/*}}}*/
 // TagFile::~pkgTagFile - Destructor					/*{{{*/
@@ -165,36 +154,6 @@ APT_PURE unsigned long pkgTagFile::Offset()
    return d->iOffset;
 }
 									/*}}}*/
-// TagFile::Resize - Resize the internal buffer				/*{{{*/
-// ---------------------------------------------------------------------
-/* Resize the internal buffer (double it in size). Fail if a maximum size
- * size is reached.
- */
-bool pkgTagFile::Resize()
-{
-   // fail is the buffer grows too big
-   if(d->Size > 1024*1024+1)
-      return false;
-
-   return Resize(d->Size * 2);
-}
-bool pkgTagFile::Resize(unsigned long long const newSize)
-{
-   unsigned long long const EndSize = d->End - d->Start;
-
-   // get new buffer and use it
-   char* const newBuffer = static_cast<char*>(realloc(d->Buffer, sizeof(char) * newSize));
-   if (newBuffer == NULL)
-      return false;
-   d->Buffer = newBuffer;
-   d->Size = newSize;
-
-   // update the start/end pointers to the new buffer
-   d->Start = d->Buffer;
-   d->End = d->Start + EndSize;
-   return true;
-}
-									/*}}}*/
 // TagFile::Step - Advance to the next section				/*{{{*/
 // ---------------------------------------------------------------------
 /* If the Section Scanner fails we refill the buffer and try again. 
@@ -203,225 +162,18 @@ bool pkgTagFile::Resize(unsigned long long const newSize)
  */
 bool pkgTagFile::Step(pkgTagSection &Tag)
 {
-   if(Tag.Scan(d->Start,d->End - d->Start) == false)
+   if(Tag.Scan(d->Start,d->End - d->Start,(d->Flags & SUPPORT_COMMENTS) != 0) == false)
    {
-      do
-      {
-	 if (Fill() == false)
-	    return false;
-
-	 if(Tag.Scan(d->Start,d->End - d->Start, false))
-	    break;
-
-	 if (Resize() == false)
+      if (d->Start == d->End)
+         return false;
+      else
 	    return _error->Warning(_("Unable to parse package file %s (%d)"),
 		  d->Fd->Name().c_str(), 1);
-
-      } while (Tag.Scan(d->Start,d->End - d->Start, false) == false);
    }
 
    size_t tagSize = Tag.size();
    d->Start += tagSize;
-
-   if ((d->Flags & pkgTagFile::SUPPORT_COMMENTS) == 0)
-      d->iOffset += tagSize;
-   else
-   {
-      auto first = d->chunks.begin();
-      for (; first != d->chunks.end(); ++first)
-      {
-	 if (first->good == false)
-	    d->iOffset += first->length;
-	 else
-	 {
-	    if (tagSize < first->length)
-	    {
-	       first->length -= tagSize;
-	       d->iOffset += tagSize;
-	       break;
-	    }
-	    else
-	    {
-	       tagSize -= first->length;
-	       d->iOffset += first->length;
-	    }
-	 }
-      }
-      d->chunks.erase(d->chunks.begin(), first);
-   }
-
-   if ((d->Flags & pkgTagFile::SUPPORT_COMMENTS) == 0 || Tag.Count() != 0)
-   {
-      Tag.Trim();
-      return true;
-   }
-   return Step(Tag);
-}
-									/*}}}*/
-// TagFile::Fill - Top up the buffer					/*{{{*/
-// ---------------------------------------------------------------------
-/* This takes the bit at the end of the buffer and puts it at the start
-   then fills the rest from the file */
-static bool FillBuffer(pkgTagFilePrivate * const d)
-{
-   unsigned long long Actual = 0;
-   // See if only a bit of the file is left
-   unsigned long long const dataSize = d->Size - ((d->End - d->Buffer) + 1);
-   if (d->Fd->Read(d->End, dataSize, &Actual) == false)
-      return false;
-   if (Actual != dataSize)
-      d->Done = true;
-   d->End += Actual;
-   return true;
-}
-static void RemoveCommentsFromBuffer(pkgTagFilePrivate * const d)
-{
-   // look for valid comments in the buffer
-   char * good_start = nullptr, * bad_start = nullptr;
-   char * current = d->Start;
-   if (d->isCommentedLine == false)
-   {
-      if (d->Start == d->Buffer)
-      {
-	 // the start of the buffer is a newline as a record can't start
-	 // in the middle of a line by definition.
-	 if (*d->Start == '#')
-	 {
-	    d->isCommentedLine = true;
-	    ++current;
-	    if (current > d->End)
-	       d->chunks.emplace_back(false, 1);
-	 }
-      }
-      if (d->isCommentedLine == false)
-	 good_start = d->Start;
-      else
-	 bad_start = d->Start;
-   }
-   else
-      bad_start = d->Start;
-
-   std::vector<std::pair<char*, size_t>> good_parts;
-   while (current <= d->End)
-   {
-      size_t const restLength = (d->End - current);
-      if (d->isCommentedLine == false)
-      {
-	 current = static_cast<char*>(memchr(current, '#', restLength));
-	 if (current == nullptr)
-	 {
-	    size_t const goodLength = d->End - good_start;
-	    d->chunks.emplace_back(true, goodLength);
-	    if (good_start != d->Start)
-	       good_parts.push_back(std::make_pair(good_start, goodLength));
-	    break;
-	 }
-	 bad_start = current;
-	 --current;
-	 // ensure that this is really a comment and not a '#' in the middle of a line
-	 if (*current == '\n')
-	 {
-	    size_t const goodLength = (current - good_start) + 1;
-	    d->chunks.emplace_back(true, goodLength);
-	    good_parts.push_back(std::make_pair(good_start, goodLength));
-	    good_start = nullptr;
-	    d->isCommentedLine = true;
-	 }
-	 current += 2;
-      }
-      else // the current line is a comment
-      {
-	 current = static_cast<char*>(memchr(current, '\n', restLength));
-	 if (current == nullptr)
-	 {
-	    d->chunks.emplace_back(false, (d->End - bad_start));
-	    break;
-	 }
-	 ++current;
-	 // is the next line a comment, too?
-	 if (current >= d->End || *current != '#')
-	 {
-	    d->chunks.emplace_back(false, (current - bad_start));
-	    good_start = current;
-	    bad_start = nullptr;
-	    d->isCommentedLine = false;
-	 }
-	 ++current;
-      }
-   }
-
-   if (good_parts.empty() == false)
-   {
-      // we found comments, so move later parts over them
-      current = d->Start;
-      for (auto const &good: good_parts)
-      {
-	 memmove(current, good.first, good.second);
-	 current += good.second;
-      }
-      d->End = current;
-   }
-
-   if (d->isCommentedLine == true)
-   {
-      // deal with a buffer containing only comments
-      // or an (unfinished) comment at the end
-      if (good_parts.empty() == true)
-	 d->End = d->Start;
-      else
-	 d->Start = d->End;
-   }
-   else
-   {
-      // the buffer was all comment, but ended with the buffer
-      if (good_parts.empty() == true && good_start >= d->End)
-	 d->End = d->Start;
-      else
-	 d->Start = d->End;
-   }
-}
-bool pkgTagFile::Fill()
-{
-   unsigned long long const EndSize = d->End - d->Start;
-   if (EndSize != 0)
-   {
-      memmove(d->Buffer,d->Start,EndSize);
-      d->Start = d->End = d->Buffer + EndSize;
-   }
-   else
-      d->Start = d->End = d->Buffer;
-
-   unsigned long long Actual = 0;
-   while (d->Done == false && d->Size > (Actual + 1))
-   {
-      if (FillBuffer(d) == false)
-	 return false;
-      if ((d->Flags & pkgTagFile::SUPPORT_COMMENTS) != 0)
-	 RemoveCommentsFromBuffer(d);
-      Actual = d->End - d->Buffer;
-   }
-   d->Start = d->Buffer;
-
-   if (d->Done == true)
-   {
-      if (EndSize <= 3 && Actual == 0)
-	 return false;
-      if (d->Size - (d->End - d->Buffer) < 4)
-	 return true;
-
-      // Append a double new line if one does not exist
-      unsigned int LineCount = 0;
-      for (const char *E = d->End - 1; E - d->End < 6 && (*E == '\n' || *E == '\r'); E--)
-	 if (*E == '\n')
-	    ++LineCount;
-      if (LineCount < 2)
-      {
-	 if (static_cast<unsigned long long>(d->End - d->Buffer) >= d->Size)
-	    Resize(d->Size + 3);
-	 for (; LineCount < 2; ++LineCount)
-	    *d->End++ = '\n';
-      }
-   }
+   d->iOffset += tagSize;
    return true;
 }
 									/*}}}*/
@@ -431,43 +183,16 @@ bool pkgTagFile::Fill()
    that is there */
 bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long long Offset)
 {
-   if ((d->Flags & pkgTagFile::SUPPORT_COMMENTS) == 0 &&
-   // We are within a buffer space of the next hit..
-	 Offset >= d->iOffset && d->iOffset + (d->End - d->Start) > Offset)
-   {
-      unsigned long long Dist = Offset - d->iOffset;
-      d->Start += Dist;
-      d->iOffset += Dist;
-      // if we have seen the end, don't ask for more
-      if (d->Done == true)
-	 return Tag.Scan(d->Start, d->End - d->Start);
-      else
-	 return Step(Tag);
-   }
+   unsigned int Size(d->Map->Size());
+   if (Offset >= Size)
+      return false;
 
    // Reposition and reload..
    d->iOffset = Offset;
    d->Done = false;
-   if (d->Fd->Seek(Offset) == false)
-      return false;
-   d->End = d->Start = d->Buffer;
-   d->isCommentedLine = false;
-   d->chunks.clear();
-
-   if (Fill() == false)
-      return false;
+   d->Start = d->Buffer + d->iOffset;
 
-   if (Tag.Scan(d->Start, d->End - d->Start) == true)
-      return true;
-   
-   // This appends a double new line (for the real eof handling)
-   if (Fill() == false)
-      return false;
-   
-   if (Tag.Scan(d->Start, d->End - d->Start, false) == false)
-      return _error->Error(_("Unable to parse package file %s (%d)"),d->Fd->Name().c_str(), 2);
-   
-   return true;
+   return Step(Tag);
 }
 									/*}}}*/
 // pkgTagSection::pkgTagSection - Constructor				/*{{{*/
@@ -483,32 +208,20 @@ pkgTagSection::pkgTagSection()
 APT_IGNORE_DEPRECATED_POP
 									/*}}}*/
 // TagSection::Scan - Scan for the end of the header information	/*{{{*/
-bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength, bool const Restart)
+bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength,bool const SupportComments)
 {
    Section = Start;
    const char *End = Start + MaxLength;
 
-   if (Restart == false && d->Tags.empty() == false)
-   {
-      Stop = Section + d->Tags.back().StartTag;
-      if (End <= Stop)
-	 return false;
-      Stop = (const char *)memchr(Stop,'\n',End - Stop);
-      if (Stop == NULL)
-	 return false;
-      ++Stop;
-   }
-   else
+   Stop = Section;
+   if (d->Tags.empty() == false)
    {
-      Stop = Section;
-      if (d->Tags.empty() == false)
-      {
-	 memset(&AlphaIndexes, 0, sizeof(AlphaIndexes));
-	 memset(&BetaIndexes, 0, sizeof(BetaIndexes));
-	 d->Tags.clear();
-      }
-      d->Tags.reserve(0x100);
+      memset(&AlphaIndexes, 0, sizeof(AlphaIndexes));
+      memset(&BetaIndexes, 0, sizeof(BetaIndexes));
+      d->Tags.clear();
    }
+   d->Tags.reserve(0x100);
+
    unsigned int TagCount = d->Tags.size();
 
    if (Stop == 0)
@@ -520,12 +233,12 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength, bool const R
    unsigned int lastTagHash = 0;
    while (Stop < End)
    {
-      TrimRecord(true,End);
+      TrimRecord(true,End,SupportComments);
 
       // this can happen when TrimRecord trims away the entire Record
       // (e.g. because it just contains comments)
       if(Stop == End)
-         return true;
+         goto end;
 
       // Start a new index and add it to the hash
       if (isspace_ascii(Stop[0]) == 0)
@@ -573,8 +286,10 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength, bool const R
 
       Stop = (const char *)memchr(Stop,'\n',End - Stop);
 
-      if (Stop == 0)
-	 return false;
+      if (Stop == 0) {
+         Stop = End;
+         goto end;
+      }
 
       for (; Stop+1 < End && Stop[1] == '\r'; Stop++)
          /* nothing */
@@ -582,7 +297,7 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength, bool const R
 
       // Double newline marks the end of the record
       if (Stop+1 < End && Stop[1] == '\n')
-      {
+      end: {
 	 if (lastTagData.EndTag != 0)
 	 {
 	    if (lastTagKey != Key::Unknown) {
@@ -595,34 +310,32 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength, bool const R
 	    d->Tags.push_back(lastTagData);
 	 }
 
+         if (d->Tags.empty())
+            return false;
+
 	 pkgTagSectionPrivate::TagData const td(Stop - Section);
 	 d->Tags.push_back(td);
-	 TrimRecord(false,End);
+	 TrimRecord(false,End,SupportComments);
 	 return true;
       }
       
       Stop++;
    }
 
-   return false;
+   goto end;
 }
 									/*}}}*/
 // TagSection::TrimRecord - Trim off any garbage before/after a record	/*{{{*/
 // ---------------------------------------------------------------------
 /* There should be exactly 2 newline at the end of the record, no more. */
-void pkgTagSection::TrimRecord(bool BeforeRecord, const char*& End)
-{
-   if (BeforeRecord == true)
-      return;
-   for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++);
-}
-									/*}}}*/
-// TagSection::Trim - Trim off any trailing garbage			/*{{{*/
-// ---------------------------------------------------------------------
-/* There should be exactly 1 newline at the end of the buffer, no more. */
-void pkgTagSection::Trim()
-{
-   for (; Stop > Section + 2 && (Stop[-2] == '\n' || Stop[-2] == '\r'); Stop--);
+void pkgTagSection::TrimRecord(bool BeforeRecord, const char*& End, bool SupportComments)
+{ trim:
+   if (BeforeRecord == false)
+      for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++);
+   if (SupportComments && Stop < End && Stop[0] == '#') {
+      Stop = (const char*) memchr(Stop,'\n',End-Stop) ?: End;
+      goto trim;
+   }
 }
 									/*}}}*/
 // TagSection::Exists - return True if a tag exists			/*{{{*/
@@ -1065,14 +778,6 @@ bool pkgTagSection::Write(FileFd &File, char const * const * const Order, std::v
 }
 									/*}}}*/
 
-void pkgUserTagSection::TrimRecord(bool /*BeforeRecord*/, const char* &End)/*{{{*/
-{
-   for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r' || Stop[0] == '#'); Stop++)
-      if (Stop[0] == '#')
-	 Stop = (const char*) memchr(Stop,'\n',End-Stop);
-}
-									/*}}}*/
-
 #include "tagfile-order.c"
 
 // TFRewrite - Rewrite a control record					/*{{{*/
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 8b59c43de..73341389b 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -138,11 +138,10 @@ class pkgTagSection
     * @return \b true if section end was found, \b false otherwise.
     *  Beware that internal state will be inconsistent if \b false is returned!
     */
-   APT_MUSTCHECK bool Scan(const char *Start, unsigned long MaxLength, bool const Restart = true);
+   APT_MUSTCHECK bool Scan(const char *Start, unsigned long MaxLength, bool const SupportComments);
 
    inline unsigned long size() const {return Stop - Section;};
-   void Trim();
-   virtual void TrimRecord(bool BeforeRecord, const char* &End);
+   void TrimRecord(bool BeforeRecord, const char* &End, bool SupportComments);
 
    /** \brief amount of Tags in the current section
     *
@@ -187,11 +186,6 @@ class pkgTagSection
 };
 
 
-class APT_DEPRECATED_MSG("Use pkgTagFile with the SUPPORT_COMMENTS flag instead") pkgUserTagSection : public pkgTagSection
-{
-   virtual void TrimRecord(bool BeforeRecord, const char* &End) APT_OVERRIDE;
-};
-
 /** \class pkgTagFile reads and prepares a deb822 formatted file for parsing
  * via #pkgTagSection. The default mode tries to be as fast as possible and
  * assumes perfectly valid (machine generated) files like Packages. Support
@@ -200,10 +194,6 @@ class pkgTagFile
 {
    pkgTagFilePrivate * const d;
 
-   APT_HIDDEN bool Fill();
-   APT_HIDDEN bool Resize();
-   APT_HIDDEN bool Resize(unsigned long long const newSize);
-
 public:
 
    bool Step(pkgTagSection &Section);
@@ -216,11 +206,11 @@ public:
       SUPPORT_COMMENTS = 1 << 0,
    };
 
-   void Init(FileFd * const F, pkgTagFile::Flags const Flags, unsigned long long Size = 32*1024);
-   void Init(FileFd * const F,unsigned long long const Size = 32*1024);
+   void Init(FileFd * const F, pkgTagFile::Flags const Flags);
+   void Init(FileFd * const F);
 
-   pkgTagFile(FileFd * const F, pkgTagFile::Flags const Flags, unsigned long long Size = 32*1024);
-   pkgTagFile(FileFd * const F,unsigned long long Size = 32*1024);
+   pkgTagFile(FileFd * const F, pkgTagFile::Flags const Flags);
+   pkgTagFile(FileFd * const F);
    virtual ~pkgTagFile();
 };
 
diff --git a/debian/libapt-pkg5.0.symbols b/debian/libapt-pkg5.0.symbols
index 882180c78..830570d87 100644
--- a/debian/libapt-pkg5.0.symbols
+++ b/debian/libapt-pkg5.0.symbols
@@ -1294,7 +1294,6 @@ libapt-pkg.so.5.0 libapt-pkg5.0 #MINVER#
  (c++)"pkgTagSection::Tag::Rename(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_5.0" 1.1~exp9
  (c++)"pkgTagSection::Tag::Rewrite(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_5.0" 1.1~exp9
  (c++)"pkgTagSection::Write(FileFd&, char const* const*, std::vector<pkgTagSection::Tag, std::allocator<pkgTagSection::Tag> > const&) const@APTPKG_5.0" 1.1~exp9
- (c++)"pkgUserTagSection::TrimRecord(bool, char const*&)@APTPKG_5.0" 1.1~exp9
  (c++)"pkgVersioningSystem::~pkgVersioningSystem()@APTPKG_5.0" 1.1~exp9
  (c++)"SigVerify::~SigVerify()@APTPKG_5.0" 1.1~exp9
  (c++)"SigVerify::SigVerify()@APTPKG_5.0" 1.1~exp9
@@ -1323,7 +1322,6 @@ libapt-pkg.so.5.0 libapt-pkg5.0 #MINVER#
  (c++)"typeinfo for pkgProblemResolver@APTPKG_5.0" 1.1~exp9
  (c++)"typeinfo for pkgRecords@APTPKG_5.0" 1.1~exp9
  (c++)"typeinfo for pkgSourceList@APTPKG_5.0" 1.1~exp9
- (c++)"typeinfo for pkgUserTagSection@APTPKG_5.0" 1.1~exp9
  (c++)"typeinfo for SigVerify@APTPKG_5.0" 1.1~exp9
  (c++)"typeinfo for TranslationsCopy@APTPKG_5.0" 1.1~exp9
  (c++)"typeinfo name for APT::PackageUniverse@APTPKG_5.0" 1.1~exp9
@@ -1347,7 +1345,6 @@ libapt-pkg.so.5.0 libapt-pkg5.0 #MINVER#
  (c++)"typeinfo name for pkgProblemResolver@APTPKG_5.0" 1.1~exp9
  (c++)"typeinfo name for pkgRecords@APTPKG_5.0" 1.1~exp9
  (c++)"typeinfo name for pkgSourceList@APTPKG_5.0" 1.1~exp9
- (c++)"typeinfo name for pkgUserTagSection@APTPKG_5.0" 1.1~exp9
  (c++)"typeinfo name for SigVerify@APTPKG_5.0" 1.1~exp9
  (c++)"typeinfo name for TranslationsCopy@APTPKG_5.0" 1.1~exp9
  (c++)"URI::ArchiveOnly(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_5.0" 1.1~exp9
@@ -1372,7 +1369,6 @@ libapt-pkg.so.5.0 libapt-pkg5.0 #MINVER#
  (c++)"vtable for pkgProblemResolver@APTPKG_5.0" 1.1~exp9
  (c++)"vtable for pkgRecords@APTPKG_5.0" 1.1~exp9
  (c++)"vtable for pkgSourceList@APTPKG_5.0" 1.1~exp9
- (c++)"vtable for pkgUserTagSection@APTPKG_5.0" 1.1~exp9
  (c++)"vtable for SigVerify@APTPKG_5.0" 1.1~exp9
  (c++)"vtable for TranslationsCopy@APTPKG_5.0" 1.1~exp9
 ### dpkg selection state changer & general dpkg interfacing