* cmdline/apt-mark:

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

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 4d2401570b5760309daf27deb4fe5b1f8f588b04..587d97534436b6a30fc84bcb665d7e625a25bdf8 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgcache.h,v 1.22 1999/07/30 02:54:25 jgg Exp $
+// $Id: pkgcache.h,v 1.25 2001/07/01 22:28:24 jgg Exp $

 /* ######################################################################
    
    Cache - Structure definitions for the cache file
 /* ######################################################################
    
    Cache - Structure definitions for the cache file


@@ -16,7 +16,6 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 
 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 


@@ -28,6 +27,9 @@
 #include <time.h>
 #include <apt-pkg/mmap.h>
 
 #include <time.h>
 #include <apt-pkg/mmap.h>
 

+using std::string;
+    
+class pkgVersioningSystem;

 class pkgCache
 {
    public:
 class pkgCache
 {
    public:


@@ -48,18 +50,20 @@ class pkgCache
    class PrvIterator;
    class PkgFileIterator;
    class VerFileIterator;
    class PrvIterator;
    class PkgFileIterator;
    class VerFileIterator;

-   friend PkgIterator;
-   friend VerIterator;
-   friend DepIterator;
-   friend PrvIterator;
-   friend PkgFileIterator;
-   friend VerFileIterator;
+   friend class PkgIterator;
+   friend class VerIterator;
+   friend class DepIterator;
+   friend class PrvIterator;
+   friend class PkgFileIterator;
+   friend class VerFileIterator;
+   
+   class Namespace;

    
    // These are all the constants used in the cache structures
    struct Dep
    {
       enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4,
    
    // These are all the constants used in the cache structures
    struct Dep
    {
       enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4,

-        Conflicts=5,Replaces=6};
+        Conflicts=5,Replaces=6,Obsoletes=7};

       enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3,
         Greater=0x4,Equals=0x5,NotEquals=0x6};
    };
       enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3,
         Greater=0x4,Equals=0x5,NotEquals=0x6};
    };


@@ -85,7 +89,7 @@ class pkgCache
    string CacheFile;
    MMap &Map;
 
    string CacheFile;
    MMap &Map;
 

-   unsigned long sHash(string S) const;
+   unsigned long sHash(const string &S) const;

    unsigned long sHash(const char *S) const;
    
    public:
    unsigned long sHash(const char *S) const;
    
    public:


@@ -104,24 +108,32 @@ class pkgCache
    virtual bool ReMap();
    inline bool Sync() {return Map.Sync();};
    inline MMap &GetMap() {return Map;};
    virtual bool ReMap();
    inline bool Sync() {return Map.Sync();};
    inline MMap &GetMap() {return Map;};

-   
+   inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();};
+      

    // String hashing function (512 range)
    // String hashing function (512 range)

-   inline unsigned long Hash(string S) const {return sHash(S);};
+   inline unsigned long Hash(const string &S) const {return sHash(S);};

    inline unsigned long Hash(const char *S) const {return sHash(S);};
 
    // Usefull transformation things
    const char *Priority(unsigned char Priority);
    
    // Accessors
    inline unsigned long Hash(const char *S) const {return sHash(S);};
 
    // Usefull transformation things
    const char *Priority(unsigned char Priority);
    
    // Accessors

-   PkgIterator FindPkg(string Name);
+   PkgIterator FindPkg(const string &Name);

    Header &Head() {return *HeaderP;};
    inline PkgIterator PkgBegin();
    inline PkgIterator PkgEnd();
    inline PkgFileIterator FileBegin();
    inline PkgFileIterator FileEnd();
    Header &Head() {return *HeaderP;};
    inline PkgIterator PkgBegin();
    inline PkgIterator PkgEnd();
    inline PkgFileIterator FileBegin();
    inline PkgFileIterator FileEnd();

-   VerIterator GetCandidateVer(PkgIterator Pkg,bool AllowCurrent = true);
+
+   // Make me a function
+   pkgVersioningSystem *VS;
+   
+   // Converters
+   static const char *CompTypeDeb(unsigned char Comp);
+   static const char *CompType(unsigned char Comp);
+   static const char *DepType(unsigned char Dep);

    
    

-   pkgCache(MMap &Map);
+   pkgCache(MMap *Map,bool DoMap = true);

    virtual ~pkgCache() {};
 };
 
    virtual ~pkgCache() {};
 };
 


@@ -154,6 +166,8 @@ struct pkgCache::Header
    // Offsets
    map_ptrloc FileList;              // struct PackageFile
    map_ptrloc StringList;            // struct StringItem
    // Offsets
    map_ptrloc FileList;              // struct PackageFile
    map_ptrloc StringList;            // struct StringItem

+   map_ptrloc VerSysName;            // StringTable
+   map_ptrloc Architecture;          // StringTable

    unsigned long MaxVerFileSize;
 
    /* Allocation pools, there should be one of these for each structure
    unsigned long MaxVerFileSize;
 
    /* Allocation pools, there should be one of these for each structure


@@ -172,9 +186,7 @@ struct pkgCache::Package
    // Pointers
    map_ptrloc Name;              // Stringtable
    map_ptrloc VersionList;       // Version
    // Pointers
    map_ptrloc Name;              // Stringtable
    map_ptrloc VersionList;       // Version

-   map_ptrloc TargetVer;         // Version

    map_ptrloc CurrentVer;        // Version
    map_ptrloc CurrentVer;        // Version

-   map_ptrloc TargetDist;        // StringTable (StringItem)

    map_ptrloc Section;           // StringTable (StringItem)
       
    // Linked list 
    map_ptrloc Section;           // StringTable (StringItem)
       
    // Linked list 


@@ -201,6 +213,8 @@ struct pkgCache::PackageFile
    map_ptrloc Origin;          // Stringtable
    map_ptrloc Label;           // Stringtable
    map_ptrloc Architecture;    // Stringtable
    map_ptrloc Origin;          // Stringtable
    map_ptrloc Label;           // Stringtable
    map_ptrloc Architecture;    // Stringtable

+   map_ptrloc Site;            // Stringtable
+   map_ptrloc IndexType;       // Stringtable

    unsigned long Size;            
    unsigned long Flags;
    
    unsigned long Size;            
    unsigned long Flags;
    


@@ -247,9 +261,9 @@ struct pkgCache::Dependency
    map_ptrloc ParentVer;       // Version
    
    // Specific types of depends
    map_ptrloc ParentVer;       // Version
    
    // Specific types of depends

+   map_ptrloc ID;   

    unsigned char Type;
    unsigned char CompareOp;
    unsigned char Type;
    unsigned char CompareOp;

-   unsigned short ID;

 };
 
 struct pkgCache::Provides
 };
 
 struct pkgCache::Provides


@@ -274,8 +288,26 @@ inline pkgCache::PkgIterator pkgCache::PkgBegin()
 inline pkgCache::PkgIterator pkgCache::PkgEnd() 
        {return PkgIterator(*this,PkgP);};
 inline pkgCache::PkgFileIterator pkgCache::FileBegin()
 inline pkgCache::PkgIterator pkgCache::PkgEnd() 
        {return PkgIterator(*this,PkgP);};
 inline pkgCache::PkgFileIterator pkgCache::FileBegin()

-       {return PkgFileIterator(*this);};
+       {return PkgFileIterator(*this,PkgFileP + HeaderP->FileList);};

 inline pkgCache::PkgFileIterator pkgCache::FileEnd()
        {return PkgFileIterator(*this,PkgFileP);};
 
 inline pkgCache::PkgFileIterator pkgCache::FileEnd()
        {return PkgFileIterator(*this,PkgFileP);};
 

+// Oh I wish for Real Name Space Support
+class pkgCache::Namespace
+{   
+   public:
+
+   typedef pkgCache::PkgIterator PkgIterator;
+   typedef pkgCache::VerIterator VerIterator;
+   typedef pkgCache::DepIterator DepIterator;
+   typedef pkgCache::PrvIterator PrvIterator;
+   typedef pkgCache::PkgFileIterator PkgFileIterator;
+   typedef pkgCache::VerFileIterator VerFileIterator;   
+   typedef pkgCache::Version Version;
+   typedef pkgCache::Package Package;
+   typedef pkgCache::Header Header;
+   typedef pkgCache::Dep Dep;
+   typedef pkgCache::Flag Flag;
+};
+

 #endif
 #endif