X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/7bb525cb8a81e77923213a83039659ca375c4239..22dcc318d978813b3c4d1ae1a1f41933d0e1d69b:/apt-pkg/tagfile.cc

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 1e5bc81a4..cae0fa819 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: tagfile.cc,v 1.36 2003/04/27 05:59:14 doogie Exp $
+// $Id: tagfile.cc,v 1.37.2.2 2003/12/31 16:02:30 mdz Exp $
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
@@ -31,7 +31,9 @@ using std::string;
 // TagFile::pkgTagFile - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) : Fd(*pFd), Size(Size)
+pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) :
+     Fd(*pFd),
+     Size(Size)
 {
    if (Fd.IsOpen() == false)
    {
@@ -42,7 +44,6 @@ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) : Fd(*pFd), Size(Size)
       return;
    }
    
-   CurSize = Size;
    Buffer = new char[Size];
    Start = End = Buffer;
    Done = false;
@@ -63,23 +64,15 @@ pkgTagFile::~pkgTagFile()
 /* If the Section Scanner fails we refill the buffer and try again. */
 bool pkgTagFile::Step(pkgTagSection &Tag)
 {
-   pkgTagSection::ScanFlags ret = Tag.Scan(Start,End - Start);
-   if (ret == pkgTagSection::ScanEOF) {
-      CurSize <<= 1;
+   if (Tag.Scan(Start,End - Start) == false)
+   {
       if (Fill() == false)
 	 return false;
-      do {
-	   ret = Tag.Scan(Start,End - Start);
-	   if (ret == pkgTagSection::ScanEOF) {
-	      CurSize <<= 1;
-	      if (Fill() == false)
-		 break;
-	   }
-      } while (ret == pkgTagSection::ScanEOF);
+      
+      if (Tag.Scan(Start,End - Start) == false)
+	 return _error->Error(_("Unable to parse package file %s (1)"),
+			      Fd.Name().c_str());
    }
-   if (ret != pkgTagSection::ScanSuccess)
-      return _error->Error(_("Unable to parse package file %s (1)"),
-			   Fd.Name().c_str());
    Start += Tag.size();
    iOffset += Tag.size();
 
@@ -156,21 +149,14 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
    if (Fill() == false)
       return false;
 
-   pkgTagSection::ScanFlags ret = Tag.Scan(Start,End - Start);
-   if (ret == pkgTagSection::ScanEOF) {
-      CurSize <<= 1;
-      if (Fill() == false)
-	 return false;
-      do {
-	   ret = Tag.Scan(Start,End - Start);
-	   if (ret == pkgTagSection::ScanEOF) {
-	      CurSize <<= 1;
-	      if (Fill() == false)
-		 break;
-	   }
-      } while (ret == pkgTagSection::ScanEOF);
-   }
-   if (ret != pkgTagSection::ScanSuccess)
+   if (Tag.Scan(Start,End - Start) == true)
+      return true;
+   
+   // This appends a double new line (for the real eof handling)
+   if (Fill() == false)
+      return false;
+   
+   if (Tag.Scan(Start,End - Start) == false)
       return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str());
    
    return true;
@@ -189,14 +175,14 @@ inline static unsigned long AlphaHash(const char *Text, const char *End = 0)
    return Res & 0xFF;
 }
 
-enum pkgTagSection::ScanFlags pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
+bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
 {
    const char *End = Start + MaxLength;
    Stop = Section = Start;
    memset(AlphaIndexes,0,sizeof(AlphaIndexes));
 
    if (Stop == 0)
-      return ScanError;
+      return false;
    
    TagCount = 0;
    while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)
@@ -211,7 +197,7 @@ enum pkgTagSection::ScanFlags pkgTagSection::Scan(const char *Start,unsigned lon
       Stop = (const char *)memchr(Stop,'\n',End - Stop);
       
       if (Stop == 0)
-	 return ScanEOF;
+	 return false;
       
       for (; Stop+1 < End && Stop[1] == '\r'; Stop++);
 
@@ -220,13 +206,13 @@ enum pkgTagSection::ScanFlags pkgTagSection::Scan(const char *Start,unsigned lon
       {
 	 Indexes[TagCount] = Stop - Section;
 	 for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++);
-	 return ScanSuccess;
+	 return true;
       }
       
       Stop++;
    }
 
-   return ScanEOF;
+   return false;
 }
 									/*}}}*/
 // TagSection::Trim - Trim off any trailing garbage			/*{{{*/