Fix api breakage caused when attempting to support bloc...

Author: doogie
Date: 2003-05-19 17:13:57 GMT
Fix api breakage caused when attempting to support blocks larger than 32k,
by backing out the patch.

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 1e5bc81..5443b17 100644 (file)
--- 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 2003/05/19 17:13:57 doogie Exp $
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
@@ -42,7 +42,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 +62,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 +147,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 +173,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 +195,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 +204,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                    /*{{{*/

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index ea2b0d7..8c94875 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: tagfile.h,v 1.19 2003/04/27 05:59:14 doogie Exp $
+// $Id: tagfile.h,v 1.20 2003/05/19 17:13:57 doogie Exp $
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
@@ -40,7 +40,6 @@ class pkgTagSection
      
    public:
    
-   enum ScanFlags {ScanSuccess=0, ScanError=1, ScanEOF=2};
    inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;};
    inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs.Section;};
    
@@ -50,7 +49,7 @@ class pkgTagSection
    signed int FindI(const char *Tag,signed long Default = 0) const ;
    bool FindFlag(const char *Tag,unsigned long &Flags,
                 unsigned long Flag) const;
-   enum ScanFlags Scan(const char *Start,unsigned long MaxLength);
+   bool Scan(const char *Start,unsigned long MaxLength);
    inline unsigned long size() const {return Stop - Section;};
    void Trim();
    
@@ -76,7 +75,7 @@ class pkgTagFile
    bool Done;
    unsigned long iOffset;
    unsigned long Size;
-   unsigned long CurSize; 
+   
    bool Fill();
    
    public:

diff --git a/debian/changelog b/debian/changelog
index bd055b8..75bcd06 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ apt (0.5.5.1) unstable; urgency=low
 
   * Move the target of the example docs from doc to binary.  Closes:
     #192331
+  * Fix api breakage that broke apt-ftparchive and apt-cache dumpavail, by
+    backing out change that incorretly attempted to handle Package sections
+    larger than 32k.  Closes: #192373
 
- -- Adam Heath <doogie@debian.org>  UNRELEASED
+ -- Adam Heath <doogie@debian.org>  Mon, 19 May 2003 11:53:49 -0500
 
 apt (0.5.5) unstable; urgency=low