Patchs for apt-cdrom

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

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 62d66590b77c516398a9543706b2f72fba3cf1e0..a55d5214a86bd6356ee09dcca30f0b058172b9d6 100644 (file)
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -1,18 +1,22 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: tagfile.cc,v 1.2 1998/07/04 05:57:39 jgg Exp $
+// $Id: tagfile.cc,v 1.15 1998/11/27 01:14:06 jgg Exp $

 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
    
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
    

-   This uses a rotating 64K buffer to load the package information into.
+   This uses a rotating buffer to load the package information into.

    The scanner runs over it and isolates and indexes a single section.
    
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    The scanner runs over it and isolates and indexes a single section.
    
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#include <pkglib/tagfile.h>
-#include <pkglib/error.h>
+#ifdef __GNUG__
+#pragma implementation "apt-pkg/tagfile.h"
+#endif
+
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/error.h>

 
 #include <string>
 #include <stdio.h>
 
 #include <string>
 #include <stdio.h>


@@ -21,11 +25,12 @@
 // TagFile::pkgTagFile - Constructor                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // TagFile::pkgTagFile - Constructor                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-pkgTagFile::pkgTagFile(File &Fd) : Fd(Fd)
+pkgTagFile::pkgTagFile(FileFd &Fd,unsigned long Size) : Fd(Fd), Size(Size)

 {
 {

-   Buffer = new char[64*1024];
-   Start = End = Buffer + 64*1024;
+   Buffer = new char[Size];
+   Start = End = Buffer;

    Left = Fd.Size();
    Left = Fd.Size();

+   iOffset = 0;

    Fill();
 }
                                                                        /*}}}*/
    Fill();
 }
                                                                        /*}}}*/


@@ -42,7 +47,9 @@ bool pkgTagFile::Step(pkgTagSection &Tag)
       if (Tag.Scan(Start,End - Start) == false)
         return _error->Error("Unable to parse package file");
    }   
       if (Tag.Scan(Start,End - Start) == false)
         return _error->Error("Unable to parse package file");
    }   

-   Start += Tag.Length();
+   Start += Tag.size();
+   iOffset += Tag.size();
+   

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


@@ -52,35 +59,59 @@ bool pkgTagFile::Step(pkgTagSection &Tag)
    then fills the rest from the file */
 bool pkgTagFile::Fill()
 {
    then fills the rest from the file */
 bool pkgTagFile::Fill()
 {

-   unsigned long Size = End - Start;
+   unsigned long EndSize = End - Start;

    
    if (Left == 0)
    {
    
    if (Left == 0)
    {

-      if (Size <= 1)
+      if (EndSize <= 1)

         return false;
       return true;
    }
    
         return false;
       return true;
    }
    

-   memmove(Buffer,Start,Size);
+   memmove(Buffer,Start,EndSize);

    Start = Buffer;
    Start = Buffer;

+   End = Buffer + EndSize;

    
    

-   // See if only a bit of the file is left or if 
-   if (Left < End - Buffer - Size)
+   // See if only a bit of the file is left
+   if (Left < Size - (End - Buffer))

    {
    {

-      if (Fd.Read(Buffer + Size,Left) == false)
+      if (Fd.Read(End,Left) == false)

         return false;
         return false;

-      End = Buffer + Size + Left;
+      
+      End += Left;

       Left = 0;
    }
    else
    {
       Left = 0;
    }
    else
    {

-      if (Fd.Read(Buffer + Size, End - Buffer - Size) == false)
+      if (Fd.Read(End,Size - (End - Buffer)) == false)

         return false;
         return false;

-      Left -= End - Buffer - Size;
+      
+      Left -= Size - (End - Buffer);
+      End = Buffer + Size;

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

+// TagFile::Jump - Jump to a pre-recorded location in the file         /*{{{*/
+// ---------------------------------------------------------------------
+/* This jumps to a pre-recorded file location and reads the record
+   that is there */
+bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
+{
+   iOffset = Offset;
+   Left = Fd.Size() - Offset;
+   if (Fd.Seek(Offset) == false)
+      return false;
+   End = Start = Buffer;
+   
+   if (Fill() == false)
+      return false;
+   
+   if (Tag.Scan(Start,End - Start) == false)
+      return _error->Error("Unable to parse package file");
+   return true;
+}
+                                                                       /*}}}*/

 // TagSection::Scan - Scan for the end of the header information       /*{{{*/
 // ---------------------------------------------------------------------
 /* This looks for the first double new line in the data stream. It also
 // TagSection::Scan - Scan for the end of the header information       /*{{{*/
 // ---------------------------------------------------------------------
 /* This looks for the first double new line in the data stream. It also


@@ -97,13 +128,16 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
    {
       if (Stop[-1] != '\n')
         continue;
    {
       if (Stop[-1] != '\n')
         continue;

+
+      // Skip line feeds
+      for (; Stop[0] == '\r' && Stop < End; Stop++);
+      

       if (Stop[0] == '\n')
       {
         // Extra one at the end to simplify find
         Indexes[TagCount] = Stop - Section;
       if (Stop[0] == '\n')
       {
         // Extra one at the end to simplify find
         Indexes[TagCount] = Stop - Section;

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

         return true;
         return true;

-        break;

       }
       
       if (isspace(Stop[0]) == 0)
       }
       
       if (isspace(Stop[0]) == 0)


@@ -139,70 +173,35 @@ bool pkgTagSection::Find(const char *Tag,const char *&Start,
       End = Section + Indexes[I+1];
       for (; (isspace(*Start) != 0 || *Start == ':') && Start < End; Start++);
       for (; isspace(End[-1]) != 0 && End > Start; End--);
       End = Section + Indexes[I+1];
       for (; (isspace(*Start) != 0 || *Start == ':') && Start < End; Start++);
       for (; isspace(End[-1]) != 0 && End > Start; End--);

+      

       return true;
    }
    Start = End = 0;
    return false;
 }
                                                                        /*}}}*/
       return true;
    }
    Start = End = 0;
    return false;
 }
                                                                        /*}}}*/

-
-#include <pkglib/pkgcachegen.h>
-#include <pkglib/deblistparser.h>
-
-int main(int argc,char *argv[])
+// pkgTagSection::FindS - Find a string                                        /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string pkgTagSection::FindS(const char *Tag)

 {
 {

-   {
-      File F(argv[1],File::ReadOnly);
-      File CacheF("./cache",File::WriteEmpty);
-      DynamicMMap Map(CacheF,MMap::Public);
-      pkgCacheGenerator Gen(Map);
-      Gen.SelectFile(argv[1]);
-      
-      debListParser Parser(F);
-      Gen.MergeList(Parser);
-   }
-
-   {
-      File CacheF("./cache",File::WriteExists);
-      MMap Map(CacheF,MMap::Public);
-      pkgCache Cache(Map);
-      for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
-      {
-        cout << "Package: " << I.Name() << endl;
-      }      
-   }
+   const char *Start;
+   const char *End;
+   if (Find(Tag,Start,End) == false)
+      return string();
+   return string(Start,End);      
+}
+                                                                       /*}}}*/
+// TagSection::FindI - Find an integer                                 /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+unsigned int pkgTagSection::FindI(const char *Tag)
+{
+   const char *Start;
+   const char *End;
+   if (Find(Tag,Start,End) == false)
+      return 0;

    
    

-#if 0 
-   pkgTagSection I;
-   while (Test.Step(I) == true)
-   {
-      const char *Start;
-      const char *End;
-      if (I.Find("Package",Start,End) == false)
-      {
-        cout << "Failed" << endl;
-        continue;
-      }
-      
-      cout << "Package: " << string(Start,End - Start) << endl;
-      
-/*      for (const char *I = Start; I < End; I++)
-      {
-        const char *Begin = I;
-        bool Number = true;
-        while (isspace(*I) == 0 && ispunct(*I) == 0 && I < End)
-        {
-           if (isalpha(*I) != 0)
-              Number = false;
-           I++;
-        }
-        if (Number == false)
-           cout << string(Begin,I-Begin) << endl;       
-        while ((isspace(*I) != 0 || ispunct(*I) != 0) && I < End)
-           I++;
-        I--;
-      }      */
-   }
-#endif   
-   _error->DumpErrors();
+   return atoi(string(Start,End).c_str());

 }
 }

+                                                                       /*}}}*/