* merged changes from Kamions upload (thanks!)

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

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 82c856f8d01bf012b50c983dbfa9398feb1b0e2f..5cff2681cd1721f682507c44a9acc63da080bee5 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.13 1998/12/14 02:23:47 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,7 +17,6 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 
 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 


@@ -26,7 +25,9 @@
 #endif 
 
 #include <apt-pkg/fileutl.h>
 #endif 
 
 #include <apt-pkg/fileutl.h>

-
+#include <apt-pkg/mmap.h>
+#include <stdio.h>
+    

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


@@ -34,7 +35,7 @@ class pkgTagSection
    
    // We have a limit of 256 tags per section.
    unsigned short Indexes[256];
    
    // We have a limit of 256 tags per section.
    unsigned short Indexes[256];

-   unsigned short AlphaIndexes[26 + 26*26];
+   unsigned short AlphaIndexes[0x100];

    
    unsigned int TagCount;
      
    
    unsigned int TagCount;
      


@@ -43,19 +44,21 @@ class pkgTagSection
    inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;};
    inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs.Section;};
    
    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 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;
+   signed int FindI(const char *Tag,signed long Default = 0) const ;
+   bool FindFlag(const char *Tag,unsigned long &Flags,
+                unsigned long Flag) const;

    bool Scan(const char *Start,unsigned long MaxLength);
    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)
+   inline unsigned long size() const {return Stop - Section;};
+   void Trim();
+   
+   inline unsigned int Count() const {return TagCount;};
+   inline void Get(const char *&Start,const char *&Stop,unsigned int I) const

                    {Start = Section + Indexes[I]; Stop = Section + Indexes[I+1];}
            
                    {Start = Section + Indexes[I]; Stop = Section + Indexes[I+1];}
            

-   inline void GetSection(const char *&Start,const char *&Stop)
+   inline void GetSection(const char *&Start,const char *&Stop) const

    {
       Start = Section;
       Stop = this->Stop;
    {
       Start = Section;
       Stop = this->Stop;


@@ -67,22 +70,37 @@ class pkgTagSection
 class pkgTagFile
 {
    FileFd &Fd;
 class pkgTagFile
 {
    FileFd &Fd;

+   MMap *Map;

    char *Buffer;
    char *Start;
    char *End;
    char *Buffer;
    char *Start;
    char *End;

-   unsigned long Left;

    unsigned long iOffset;
    unsigned long Size;
    
    unsigned long iOffset;
    unsigned long Size;
    

-   bool Fill();
-   

    public:
 
    bool Step(pkgTagSection &Section);
    inline unsigned long Offset() {return iOffset;};
    bool Jump(pkgTagSection &Tag,unsigned long Offset);
    public:
 
    bool Step(pkgTagSection &Section);
    inline unsigned long Offset() {return iOffset;};
    bool Jump(pkgTagSection &Tag,unsigned long Offset);

-   
-   pkgTagFile(FileFd &F,unsigned long Size = 32*1024);
+
+   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