ready for 0.7.20 upload

[apt.git] / apt-pkg / tagfile.cc

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 1e5bc81a4b6b93846101f96882be358791a4a881..893cb8ee7700ae2055a70517a9c6753143b397f6 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.2.2 2003/12/31 16:02:30 mdz Exp $
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
@@ -11,10 +11,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/tagfile.h"
-#endif
-
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
@@ -31,7 +27,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 +40,6 @@ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) : Fd(*pFd), Size(Size)
       return;
    }
    
-   CurSize = Size;
    Buffer = new char[Size];
    Start = End = Buffer;
    Done = false;
@@ -58,28 +55,53 @@ pkgTagFile::~pkgTagFile()
    delete [] Buffer;
 }
                                                                        /*}}}*/
+// 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()
+{
+   char *tmp;
+   unsigned long EndSize = End - Start;
+
+   // fail is the buffer grows too big
+   if(Size > 1024*1024+1)
+      return false;
+
+   // get new buffer and use it
+   tmp = new char[2*Size];
+   memcpy(tmp, Buffer, Size);
+   Size = Size*2;
+   delete [] Buffer;
+   Buffer = tmp;
+
+   // update the start/end pointers to the new buffer
+   Start = Buffer;
+   End = Start + EndSize;
+   return true;
+}
+
 // TagFile::Step - Advance to the next section                         /*{{{*/
 // ---------------------------------------------------------------------
-/* If the Section Scanner fails we refill the buffer and try again. */
+/* If the Section Scanner fails we refill the buffer and try again. 
+ * If that fails too, double the buffer size and try again until a
+ * maximum buffer is reached.
+ */
 bool pkgTagFile::Step(pkgTagSection &Tag)
 {
-   pkgTagSection::ScanFlags ret = Tag.Scan(Start,End - Start);
-   if (ret == pkgTagSection::ScanEOF) {
-      CurSize <<= 1;
+   while (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))
+        break;
+
+      if (Resize() == 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 +178,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;
@@ -180,23 +195,23 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
 // ---------------------------------------------------------------------
 /* This looks for the first double new line in the data stream. It also
    indexes the tags in the section. This very simple hash function for the
-   first 3 letters gives very good performance on the debian package files */
+   last 8 letters gives very good performance on the debian package files */
 inline static unsigned long AlphaHash(const char *Text, const char *End = 0)
 {
    unsigned long Res = 0;
    for (; Text != End && *Text != ':' && *Text != 0; Text++)
-      Res = (unsigned long)(*Text) ^ (Res << 2);
+      Res = ((unsigned long)(*Text) & 0xDF) ^ (Res << 1);
    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 +226,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 +235,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                    /*{{{*/
@@ -404,11 +419,13 @@ static const char *iTFRewritePackageOrder[] = {
                           "Recommends",
                           "Suggests",
                           "Conflicts",
+                          "Breaks",
                           "Conffiles",
                           "Filename",
                           "Size",
                           "MD5Sum",
-                          "SHA1Sum",
+                          "SHA1",
+                          "SHA256",
                            "MSDOS-Filename",   // Obsolete
                           "Description",
                           0};