* apt-pkg/indexfile.cc:

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

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index fdeb09329dba2ce524cf1cdd5979abd121839488..cae0fa81989f5e4ba0e6a8e7ce77012e1da0be28 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.28 2001/03/13 06:51:46 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


@@ -23,26 +23,30 @@
     
 #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)
    {
       Buffer = 0;
       Start = End = Buffer = 0;
 {
    if (Fd.IsOpen() == false)
    {
       Buffer = 0;
       Start = End = Buffer = 0;

-      Left = 0;
+      Done = true;

       iOffset = 0;
       return;
    }
    
    Buffer = new char[Size];
    Start = End = Buffer;
       iOffset = 0;
       return;
    }
    
    Buffer = new char[Size];
    Start = End = Buffer;

-   Left = Fd.Size();
-   TotalSize = Fd.Size();
+   Done = false;

    iOffset = 0;
    Fill();
 }
    iOffset = 0;
    Fill();
 }


@@ -66,13 +70,13 @@ bool pkgTagFile::Step(pkgTagSection &Tag)
         return false;
       
       if (Tag.Scan(Start,End - Start) == false)
         return false;
       
       if (Tag.Scan(Start,End - Start) == false)

-        return _error->Error(_("Unable to parse package file %s (1)"),Fd.Name().c_str());
-   }   
+        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;
 }
                                                                        /*}}}*/


@@ -83,14 +87,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 (Left == 0)
+   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 (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;


@@ -106,23 +121,6 @@ bool pkgTagFile::Fill()
       return true;
    }
    
       return true;
    }
    

-   // See if only a bit of the file is left
-   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;
 }
                                                                        /*}}}*/


@@ -143,7 +141,7 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
 
    // Reposition and reload..
    iOffset = Offset;
 
    // Reposition and reload..
    iOffset = Offset;

-   Left = TotalSize - Offset;
+   Done = false;

    if (Fd.Seek(Offset) == false)
       return false;
    End = Start = Buffer;
    if (Fd.Seek(Offset) == false)
       return false;
    End = Start = Buffer;


@@ -187,7 +185,7 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
       return false;
    
    TagCount = 0;
       return false;
    
    TagCount = 0;

-   while (TagCount < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)
+   while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < 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)


@@ -201,13 +199,13 @@ 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++);
+        for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++);

         return true;
       }
       
         return true;
       }