merged from the mvo branch

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

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index faea00ec50fd3d36bf71f9ffb0ec679205623279..7c5d15a58b0df992ab95e659d1ba555f9c838649 100644 (file)
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: tagfile.cc,v 1.29 2001/04/22 05:42:52 jgg 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
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information


@@ -11,10 +11,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // 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>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>


@@ -23,12 +19,17 @@
     
 #include <string>
 #include <stdio.h>
     
 #include <string>
 #include <stdio.h>

+#include <ctype.h>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

+using std::string;
+

 // TagFile::pkgTagFile - Constructor                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // 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)
    {
 {
    if (Fd.IsOpen() == false)
    {


@@ -54,24 +55,57 @@ pkgTagFile::~pkgTagFile()
    delete [] Buffer;
 }
                                                                        /*}}}*/
    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                         /*{{{*/
 // ---------------------------------------------------------------------
 // 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)
 {
 bool pkgTagFile::Step(pkgTagSection &Tag)
 {

-   if (Tag.Scan(Start,End - Start) == false)
+   while (Tag.Scan(Start,End - Start) == false)

    {
       if (Fill() == false)
         return false;
       
    {
       if (Fill() == false)
         return false;
       

-      if (Tag.Scan(Start,End - Start) == false)
-        return _error->Error(_("Unable to parse package file %s (1)"),Fd.Name().c_str());
-   }   
+      if(Tag.Scan(Start,End - Start))
+        break;
+
+      if (Resize() == false)
+        return _error->Error(_("Unable to parse package file %s (1)"),
+                                Fd.Name().c_str());
+   }

    Start += Tag.size();
    iOffset += Tag.size();
 
    Tag.Trim();
    Start += Tag.size();
    iOffset += Tag.size();
 
    Tag.Trim();

-   

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -82,14 +116,25 @@ bool pkgTagFile::Step(pkgTagSection &Tag)
 bool pkgTagFile::Fill()
 {
    unsigned long EndSize = End - Start;
 bool pkgTagFile::Fill()
 {
    unsigned long EndSize = End - Start;

+   unsigned long Actual = 0;

    
    memmove(Buffer,Start,EndSize);
    Start = Buffer;
    End = Buffer + EndSize;
    
    
    memmove(Buffer,Start,EndSize);
    Start = Buffer;
    End = Buffer + EndSize;
    

+   if (Done == false)
+   {
+      // See if only a bit of the file is left
+      if (Fd.Read(End,Size - (End - Buffer),&Actual) == false)
+        return false;
+      if (Actual != Size - (End - Buffer))
+        Done = true;
+      End += Actual;
+   }
+   

    if (Done == true)
    {
    if (Done == true)
    {

-      if (EndSize <= 3)
+      if (EndSize <= 3 && Actual == 0)

         return false;
       if (Size - (End - Buffer) < 4)
         return true;
         return false;
       if (Size - (End - Buffer) < 4)
         return true;


@@ -105,31 +150,6 @@ bool pkgTagFile::Fill()
       return true;
    }
    
       return true;
    }
    

-   // See if only a bit of the file is left
-   unsigned long Actual;
-   if (Fd.Read(End,Size - (End - Buffer),&Actual) == false)
-      return false;
-   if (Actual != Size - (End - Buffer))
-      Done = true;
-   End += Actual;
-/*   
-   if (Left < Size - (End - Buffer))
-   {
-      if (Fd.Read(End,Left) == false)
-        return false;
-      
-      End += Left;
-      Left = 0;
-   }
-   else
-   {
-      if (Fd.Read(End,Size - (End - Buffer)) == false)
-        return false;
-      
-      Left -= Size - (End - Buffer);
-      End = Buffer + Size;
-   }*/
-   

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -175,12 +195,12 @@ 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
 // ---------------------------------------------------------------------
 /* 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++)
 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;
 }
 
    return Res & 0xFF;
 }
 


@@ -192,10 +212,12 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
 
    if (Stop == 0)
       return false;
 
    if (Stop == 0)
       return false;

-   
+

    TagCount = 0;
    TagCount = 0;

-   while (TagCount < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)
+   while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)

    {
    {

+       TrimRecord(true,End);
+

       // Start a new index and add it to the hash
       if (isspace(Stop[0]) == 0)
       {
       // Start a new index and add it to the hash
       if (isspace(Stop[0]) == 0)
       {


@@ -207,14 +229,14 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
       
       if (Stop == 0)
         return false;
       
       if (Stop == 0)
         return false;

-      
-      for (; Stop[1] == '\r' && Stop+1 < End; Stop++);
+
+      for (; Stop+1 < End && Stop[1] == '\r'; Stop++);

 
       // Double newline marks the end of the record
       if (Stop+1 < End && Stop[1] == '\n')
       {
         Indexes[TagCount] = Stop - Section;
 
       // Double newline marks the end of the record
       if (Stop+1 < End && Stop[1] == '\n')
       {
         Indexes[TagCount] = Stop - Section;

-        for (; (Stop[0] == '\n' || Stop[0] == '\r') && Stop < End; Stop++);
+        TrimRecord(false,End);

         return true;
       }
       
         return true;
       }
       


@@ -224,6 +246,16 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

+// 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. */
 // TagSection::Trim - Trim off any trailing garbage                    /*{{{*/
 // ---------------------------------------------------------------------
 /* There should be exactly 1 newline at the end of the buffer, no more. */


@@ -370,7 +402,6 @@ bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags,
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-

 // TFRewrite - Rewrite a control record                                        /*{{{*/
 // ---------------------------------------------------------------------
 /* This writes the control record to stdout rewriting it as necessary. The
 // TFRewrite - Rewrite a control record                                        /*{{{*/
 // ---------------------------------------------------------------------
 /* This writes the control record to stdout rewriting it as necessary. The


@@ -399,11 +430,13 @@ static const char *iTFRewritePackageOrder[] = {
                           "Recommends",
                           "Suggests",
                           "Conflicts",
                           "Recommends",
                           "Suggests",
                           "Conflicts",

+                          "Breaks",

                           "Conffiles",
                           "Filename",
                           "Size",
                           "MD5Sum",
                           "Conffiles",
                           "Filename",
                           "Size",
                           "MD5Sum",

-                          "SHA1Sum",
+                          "SHA1",
+                          "SHA256",

                            "MSDOS-Filename",   // Obsolete
                           "Description",
                           0};
                            "MSDOS-Filename",   // Obsolete
                           "Description",
                           0};