Merge remote-tracking branch 'upstream/debian/sid' into debian/sid

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

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 948adb4260f15a64ef5f01be25ec8581ad47c5b6..d5b62e76dfd763ef7b541722b99665161f7a1bdf 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: tagfile.h,v 1.15 2001/02/20 07:03:17 jgg Exp $
+// $Id: tagfile.h,v 1.20 2003/05/19 17:13:57 doogie Exp $

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


@@ -20,40 +20,63 @@
 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 
 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/tagfile.h"
-#endif 
+#include <apt-pkg/macros.h>

 
 

-#include <apt-pkg/fileutl.h>

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

-    
+
+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>
+#endif
+
+class FileFd;
+

 class pkgTagSection
 {
    const char *Section;
 class pkgTagSection
 {
    const char *Section;

-   const char *Stop;
-   

    // We have a limit of 256 tags per section.
    // We have a limit of 256 tags per section.

-   unsigned short Indexes[256];
-   unsigned short AlphaIndexes[0xff];
-   
+   unsigned int Indexes[256];
+   unsigned int AlphaIndexes[0x100];

    unsigned int TagCount;
    unsigned int TagCount;

-     
+   // dpointer placeholder (for later in case we need it)
+   void *d;
+
+   /* This very simple hash function for the 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) & 0xDF) ^ (Res << 1);
+      return Res & 0xFF;
+   }
+
+   protected:
+   const char *Stop;
+

    public:
    
    inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;};
    inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs.Section;};
    
    bool Find(const char *Tag,const char *&Start, const char *&End) const;
    public:
    
    inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;};
    inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs.Section;};
    
    bool Find(const char *Tag,const char *&Start, const char *&End) const;

-   bool Find(const char *Tag,unsigned &Pos) const;
-   string FindS(const char *Tag) const;
+   bool Find(const char *Tag,unsigned int &Pos) const;
+   std::string FindS(const char *Tag) const;

    signed int FindI(const char *Tag,signed long Default = 0) const ;
    signed int FindI(const char *Tag,signed long Default = 0) const ;

-   bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags,
-                               unsigned long Flag) const;
+   unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const;
+   bool FindFlag(const char *Tag,unsigned long &Flags,
+                unsigned long Flag) const;
+   bool static FindFlag(unsigned long &Flags, unsigned long Flag,
+                               const char* Start, const char* Stop);

    bool Scan(const char *Start,unsigned long MaxLength);
    inline unsigned long size() const {return Stop - Section;};
    void Trim();
    bool Scan(const char *Start,unsigned long MaxLength);
    inline unsigned long size() const {return Stop - Section;};
    void Trim();

+   virtual void TrimRecord(bool BeforeRecord, const char* &End);

    
    inline unsigned int Count() const {return TagCount;};
    
    inline unsigned int Count() const {return TagCount;};

+   bool Exists(const char* const Tag);
+ 

    inline void Get(const char *&Start,const char *&Stop,unsigned int I) const
                    {Start = Section + Indexes[I]; Stop = Section + Indexes[I+1];}
            
    inline void Get(const char *&Start,const char *&Stop,unsigned int I) const
                    {Start = Section + Indexes[I]; Stop = Section + Indexes[I+1];}
            


@@ -63,30 +86,27 @@ class pkgTagSection
       Stop = this->Stop;
    };
    
       Stop = this->Stop;
    };
    

-   pkgTagSection() : Section(0), Stop(0) {};
+   pkgTagSection();
+   virtual ~pkgTagSection() {};

 };
 
 };
 

+class pkgTagFilePrivate;

 class pkgTagFile
 {
 class pkgTagFile
 {

-   FileFd &Fd;
-   char *Buffer;
-   char *Start;
-   char *End;
-   unsigned long Left;
-   unsigned long iOffset;
-   unsigned long Size;
-   unsigned long TotalSize;
-   
-   bool Fill();
-   
+   pkgTagFilePrivate *d;
+
+   APT_HIDDEN bool Fill();
+   APT_HIDDEN bool Resize();
+   APT_HIDDEN bool Resize(unsigned long long const newSize);
+

    public:
 
    bool Step(pkgTagSection &Section);
    public:
 
    bool Step(pkgTagSection &Section);

-   inline unsigned long Offset() {return iOffset;};
-   bool Jump(pkgTagSection &Tag,unsigned long Offset);
+   unsigned long Offset();
+   bool Jump(pkgTagSection &Tag,unsigned long long Offset);

 
 

-   pkgTagFile(FileFd *F,unsigned long Size = 32*1024);
-   ~pkgTagFile();
+   pkgTagFile(FileFd *F,unsigned long long Size = 32*1024);
+   virtual ~pkgTagFile();

 };
 
 /* This is the list of things to rewrite. The rewriter
 };
 
 /* This is the list of things to rewrite. The rewriter