move ByHash into its own function

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

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 84998629d9e99685f17b0a26c56499e7ec364263..db43bfbf961da1d4983595b9edc851f4161f243a 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -1,12 +1,12 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: tagfile.h,v 1.14 1999/07/03 06:45:40 jgg Exp $
+// $Id: tagfile.h,v 1.20 2003/05/19 17:13:57 doogie Exp $

 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
    
    This parser handles Debian package files (and others). Their form is
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
    
    This parser handles Debian package files (and others). Their form is

-   RFC-822 type header fields in groups seperated by a blank line.
+   RFC-822 type header fields in groups separated by a blank line.

    
    The parser reads the file and provides methods to step linearly
    over it or to jump to a pre-recorded start point and read that record.
    
    The parser reads the file and provides methods to step linearly
    over it or to jump to a pre-recorded start point and read that record.


@@ -17,73 +17,136 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #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 <stdio.h>
+
+#include <string>
+#include <vector>
+#include <list>
+
+#ifndef APT_8_CLEANER_HEADERS

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

+#endif
+
+class FileFd;

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

+   struct TagData {
+      unsigned int StartTag;
+      unsigned int EndTag;
+      unsigned int StartValue;
+      unsigned int NextInBucket;
+
+      TagData(unsigned int const StartTag) : StartTag(StartTag), NextInBucket(0) {}
+   };
+   std::vector<TagData> Tags;
+   unsigned int LookupTable[0x100];
+
+   // dpointer placeholder (for later in case we need it)
+   void *d;
+
+   protected:

    const char *Stop;
    const char *Stop;

-   
-   // We have a limit of 256 tags per section.
-   unsigned short Indexes[256];
-   unsigned short AlphaIndexes[26 + 26*26];
-   
-   unsigned int TagCount;
-     
+

    public:
    
    inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;};
    inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs.Section;};
    
    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);
-   string FindS(const char *Tag);
-   signed int FindI(const char *Tag,signed long Default = 0);
-   bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags,
-                               unsigned long Flag);
-   bool Scan(const char *Start,unsigned long MaxLength);
-   inline unsigned long size() {return Stop - Section;};
-
-   inline unsigned int Count() {return TagCount;};
-   inline void Get(const char *&Start,const char *&Stop,unsigned int I)
-                   {Start = Section + Indexes[I]; Stop = Section + Indexes[I+1];}
-           
-   inline void GetSection(const char *&Start,const char *&Stop)
+   bool Find(const char *Tag,const char *&Start, const char *&End) 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;
+   bool FindB(const char *Tag, bool const &Default = false) 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);
+
+   /** \brief searches the boundaries of the current section
+    *
+    * While parameter Start marks the beginning of the section, this method
+    * will search for the first double newline in the data stream which marks
+    * the end of the section. It also does a first pass over the content of
+    * the section parsing it as encountered for processing later on by Find
+    *
+    * @param Start is the beginning of the section
+    * @param MaxLength is the size of valid data in the stream pointed to by Start
+    * @param Restart if enabled internal state will be cleared, otherwise it is
+    *  assumed that now more data is available in the stream and the parsing will
+    *  start were it encountered insufficent data the last time.
+    *
+    * @return \b true if section end was found, \b false otherwise.
+    *  Beware that internal state will be inconsistent if \b false is returned!
+    */
+   APT_MUSTCHECK bool Scan(const char *Start, unsigned long MaxLength, bool const Restart = true);
+   inline unsigned long size() const {return Stop - Section;};
+   void Trim();
+   virtual void TrimRecord(bool BeforeRecord, const char* &End);
+
+   /** \brief amount of Tags in the current section
+    *
+    * Note: if a Tag is mentioned repeatly it will be counted multiple
+    * times, but only the last occurance is available via Find methods.
+    */
+   unsigned int Count() const;
+   bool Exists(const char* const Tag) const;
+
+   inline void Get(const char *&Start,const char *&Stop,unsigned int I) const
+                   {Start = Section + Tags[I].StartTag; Stop = Section + Tags[I+1].StartTag;}
+
+   inline void GetSection(const char *&Start,const char *&Stop) const

    {
       Start = Section;
       Stop = this->Stop;
    };
    
    {
       Start = Section;
       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;
-   
-   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);
+
+   void Init(FileFd *F,unsigned long long Size = 32*1024);
+
+   pkgTagFile(FileFd *F,unsigned long long Size = 32*1024);
+   virtual ~pkgTagFile();
+};

 
 

-   pkgTagFile(FileFd &F,unsigned long Size = 32*1024);
-   ~pkgTagFile();
+/* This is the list of things to rewrite. The rewriter
+   goes through and changes or adds each of these headers
+   to suit. A zero forces the header to be erased, an empty string
+   causes the old value to be used. (rewrite rule ignored) */
+struct TFRewriteData
+{
+   const char *Tag;
+   const char *Rewrite;
+   const char *NewTag;

 };
 };

+extern const char **TFRewritePackageOrder;
+extern const char **TFRewriteSourceOrder;
+
+bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[],
+              TFRewriteData *Rewrite);

 
 #endif
 
 #endif