use clock() as source for SRV randomness

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

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index b6259b43383bc09e05f8f5028784322961467f70..46fccdaa5eecd6d5f39048d9bbd7a83dfbf6b996 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgcachegen.h,v 1.19 2002/07/08 03:13:30 jgg Exp $

 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.


@@ -19,37 +18,43 @@
 #ifndef PKGLIB_PKGCACHEGEN_H
 #define PKGLIB_PKGCACHEGEN_H
 
 #ifndef PKGLIB_PKGCACHEGEN_H
 #define PKGLIB_PKGCACHEGEN_H
 

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

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

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

 #include <apt-pkg/macros.h>
 
 #include <vector>
 #include <apt-pkg/macros.h>
 
 #include <vector>

+#include <string>
+#include <map>

 
 

+class FileFd;

 class pkgSourceList;
 class OpProgress;
 class pkgSourceList;
 class OpProgress;

-class MMap;

 class pkgIndexFile;
 class pkgIndexFile;

+class pkgCacheListParser;

 
 

-class pkgCacheGenerator                                                        /*{{{*/
+class APT_HIDDEN pkgCacheGenerator                                     /*{{{*/

 {
 {

-   private:
+   APT_HIDDEN map_stringitem_t WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); };
+   APT_HIDDEN map_stringitem_t WriteStringInMap(const char *String);
+   APT_HIDDEN map_stringitem_t WriteStringInMap(const char *String, const unsigned long &Len);
+   APT_HIDDEN map_pointer_t AllocateInMap(const unsigned long &size);

 
 

-   pkgCache::StringItem *UniqHash[26];
-   map_ptrloc WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); };
-   map_ptrloc WriteStringInMap(const char *String);
-   map_ptrloc WriteStringInMap(const char *String, const unsigned long &Len);
-   map_ptrloc AllocateInMap(const unsigned long &size);
+   std::map<std::string,map_stringitem_t> strMixed;
+   std::map<std::string,map_stringitem_t> strSections;
+   std::map<std::string,map_stringitem_t> strPkgNames;
+   std::map<std::string,map_stringitem_t> strVersions;
+
+   friend class pkgCacheListParser;
+   typedef pkgCacheListParser ListParser;

 
    public:
 
    public:

-   
-   class ListParser;
-   friend class ListParser;

 
    template<typename Iter> class Dynamic {
       public:
       static std::vector<Iter*> toReMap;
 
    template<typename Iter> class Dynamic {
       public:
       static std::vector<Iter*> toReMap;

-      Dynamic(Iter &I) {
+      explicit Dynamic(Iter &I) {

         toReMap.push_back(&I);
       }
 
         toReMap.push_back(&I);
       }
 


@@ -63,85 +68,95 @@ class pkgCacheGenerator                                                     /*{{{*/
    DynamicMMap &Map;
    pkgCache Cache;
    OpProgress *Progress;
    DynamicMMap &Map;
    pkgCache Cache;
    OpProgress *Progress;

-   
+
+   std::string RlsFileName;
+   pkgCache::ReleaseFile *CurrentRlsFile;

    std::string PkgFileName;
    pkgCache::PackageFile *CurrentFile;
 
    std::string PkgFileName;
    pkgCache::PackageFile *CurrentFile;
 

-   // Flag file dependencies
-   bool FoundFileDeps;
-   

    bool NewGroup(pkgCache::GrpIterator &Grp,const std::string &Name);
    bool NewPackage(pkgCache::PkgIterator &Pkg,const std::string &Name, const std::string &Arch);
    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
    bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
    bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver,
    bool NewGroup(pkgCache::GrpIterator &Grp,const std::string &Name);
    bool NewPackage(pkgCache::PkgIterator &Pkg,const std::string &Name, const std::string &Arch);
    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
    bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
    bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver,

-                  std::string const &Version, unsigned int const &Op,
-                  unsigned int const &Type, map_ptrloc* &OldDepLast);
-   unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,unsigned long Next);
-   map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const std::string &Lang,const MD5SumValue &md5sum,map_ptrloc Next);
+                  map_pointer_t const Version, uint8_t const Op,
+                  uint8_t const Type, map_pointer_t* &OldDepLast);
+   map_pointer_t NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,map_pointer_t const Next) APT_DEPRECATED
+   { return NewVersion(Ver, VerStr, 0, 0, Next); }
+   map_pointer_t NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,
+                           map_pointer_t const ParentPkg, unsigned short const Hash,
+                           map_pointer_t const Next);
+   map_pointer_t NewDescription(pkgCache::DescIterator &Desc,const std::string &Lang,const MD5SumValue &md5sum,map_stringitem_t const idxmd5str);
+   bool NewProvides(pkgCache::VerIterator &Ver, pkgCache::PkgIterator &Pkg,
+                   map_stringitem_t const ProvidesVersion, uint8_t const Flags);

 
    public:
 
 
    public:
 

-   unsigned long WriteUniqString(const char *S,unsigned int Size);
-   inline unsigned long WriteUniqString(const std::string &S) {return WriteUniqString(S.c_str(),S.length());};
+   enum StringType { MIXED, PKGNAME, VERSIONNUMBER, SECTION };
+   map_stringitem_t StoreString(StringType const type, const char * S, unsigned int const Size);
+   inline map_stringitem_t StoreString(enum StringType const type, const std::string &S) {return StoreString(type, S.c_str(),S.length());};

 
    void DropProgress() {Progress = 0;};
 
    void DropProgress() {Progress = 0;};

-   bool SelectFile(const std::string &File,const std::string &Site,pkgIndexFile const &Index,
-                  unsigned long Flags = 0);
+   bool SelectFile(const std::string &File,pkgIndexFile const &Index, std::string const &Architecture, std::string const &Component, unsigned long Flags = 0);
+   bool SelectReleaseFile(const std::string &File, const std::string &Site, unsigned long Flags = 0);

    bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
    inline pkgCache &GetCache() {return Cache;};
    bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
    inline pkgCache &GetCache() {return Cache;};

-   inline pkgCache::PkgFileIterator GetCurFile() 
+   inline pkgCache::PkgFileIterator GetCurFile()

          {return pkgCache::PkgFileIterator(Cache,CurrentFile);};
          {return pkgCache::PkgFileIterator(Cache,CurrentFile);};

+   inline pkgCache::RlsFileIterator GetCurRlsFile()
+         {return pkgCache::RlsFileIterator(Cache,CurrentRlsFile);};

 
 

-   bool HasFileDeps() {return FoundFileDeps;};
-   bool MergeFileProvides(ListParser &List);
-   __deprecated bool FinishCache(OpProgress *Progress);
-
-   static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress,
+   APT_PUBLIC static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress,

                        MMap **OutMap = 0,bool AllowMem = false);
                        MMap **OutMap = 0,bool AllowMem = false);

-   static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap);
-   static DynamicMMap* CreateDynamicMMap(FileFd *CacheF, unsigned long Flags = 0);
+   APT_PUBLIC static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap);

 
    void ReMap(void const * const oldMap, void const * const newMap);
 
    pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);
 
    void ReMap(void const * const oldMap, void const * const newMap);
 
    pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);

-   ~pkgCacheGenerator();
+   virtual ~pkgCacheGenerator();

 
    private:
 
    private:

-   bool MergeListGroup(ListParser &List, std::string const &GrpName);
-   bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
-   bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
+   void * const d;
+   APT_HIDDEN bool MergeListGroup(ListParser &List, std::string const &GrpName);
+   APT_HIDDEN bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
+   APT_HIDDEN bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,

                         std::string const &Version, pkgCache::VerIterator* &OutVer);
 
                         std::string const &Version, pkgCache::VerIterator* &OutVer);
 

-   bool AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P,
+   APT_HIDDEN bool AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P,

                           pkgCache::VerIterator &V);
                           pkgCache::VerIterator &V);

-   bool AddImplicitDepends(pkgCache::VerIterator &V, pkgCache::PkgIterator &D);
+   APT_HIDDEN bool AddImplicitDepends(pkgCache::VerIterator &V, pkgCache::PkgIterator &D);
+
+   APT_HIDDEN bool AddNewDescription(ListParser &List, pkgCache::VerIterator &Ver,
+        std::string const &lang, MD5SumValue const &CurMd5, map_stringitem_t &md5idx);

 };
                                                                        /*}}}*/
 // This is the abstract package list parser class.                     /*{{{*/
 };
                                                                        /*}}}*/
 // This is the abstract package list parser class.                     /*{{{*/

-class pkgCacheGenerator::ListParser
+class APT_HIDDEN pkgCacheListParser

 {
    pkgCacheGenerator *Owner;
    friend class pkgCacheGenerator;
 {
    pkgCacheGenerator *Owner;
    friend class pkgCacheGenerator;

-   
+

    // Some cache items
    pkgCache::VerIterator OldDepVer;
    // Some cache items
    pkgCache::VerIterator OldDepVer;

-   map_ptrloc *OldDepLast;
+   map_pointer_t *OldDepLast;
+
+   void * const d;

 
 

-   // Flag file dependencies
-   bool FoundFileDeps;
-      

    protected:
 
    protected:
 

-   inline unsigned long WriteUniqString(std::string S) {return Owner->WriteUniqString(S);};
-   inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);};
-   inline unsigned long WriteString(const std::string &S) {return Owner->WriteStringInMap(S);};
-   inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->WriteStringInMap(S,Size);};
+   inline map_stringitem_t StoreString(pkgCacheGenerator::StringType const type, std::string const &S) {return Owner->StoreString(type, S);};
+   inline map_stringitem_t StoreString(pkgCacheGenerator::StringType const type, const char *S,unsigned int Size) {return Owner->StoreString(type, S, Size);};
+
+   inline map_stringitem_t WriteString(const std::string &S) {return Owner->WriteStringInMap(S);};
+   inline map_stringitem_t WriteString(const char *S,unsigned int Size) {return Owner->WriteStringInMap(S,Size);};

    bool NewDepends(pkgCache::VerIterator &Ver,const std::string &Package, const std::string &Arch,
    bool NewDepends(pkgCache::VerIterator &Ver,const std::string &Package, const std::string &Arch,

-                  const std::string &Version,unsigned int Op,
-                  unsigned int Type);
+                  const std::string &Version,uint8_t const Op,
+                  uint8_t const Type);

    bool NewProvides(pkgCache::VerIterator &Ver,const std::string &PkgName,
    bool NewProvides(pkgCache::VerIterator &Ver,const std::string &PkgName,

-                   const std::string &PkgArch, const std::string &Version);
+                   const std::string &PkgArch, const std::string &Version,
+                   uint8_t const Flags);
+   bool NewProvidesAllArch(pkgCache::VerIterator &Ver, std::string const &Package,
+                          std::string const &Version, uint8_t const Flags);

    
    public:
    
    
    public:
    


@@ -151,23 +166,28 @@ class pkgCacheGenerator::ListParser
    virtual bool ArchitectureAll() = 0;
    virtual std::string Version() = 0;
    virtual bool NewVersion(pkgCache::VerIterator &Ver) = 0;
    virtual bool ArchitectureAll() = 0;
    virtual std::string Version() = 0;
    virtual bool NewVersion(pkgCache::VerIterator &Ver) = 0;

-   virtual std::string Description() = 0;
-   virtual std::string DescriptionLanguage() = 0;
+   virtual std::string Description(std::string const &lang) = 0;
+   virtual std::vector<std::string> AvailableDescriptionLanguages() = 0;

    virtual MD5SumValue Description_md5() = 0;
    virtual unsigned short VersionHash() = 0;
    virtual MD5SumValue Description_md5() = 0;
    virtual unsigned short VersionHash() = 0;

+   /** compare currently parsed version with given version
+    *
+    * \param Hash of the currently parsed version
+    * \param Ver to compare with
+    */
+   virtual bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);

    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
                           pkgCache::VerIterator &Ver) = 0;
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
                           pkgCache::VerIterator &Ver) = 0;

-   virtual unsigned long Offset() = 0;
-   virtual unsigned long Size() = 0;
+   virtual map_filesize_t Offset() = 0;
+   virtual map_filesize_t Size() = 0;

    
    virtual bool Step() = 0;
    
    
    virtual bool Step() = 0;
    

-   inline bool HasFileDeps() {return FoundFileDeps;};
-   virtual bool CollectFileProvides(pkgCache &Cache,
-                                   pkgCache::VerIterator &Ver) {return true;};
+   virtual bool CollectFileProvides(pkgCache &/*Cache*/,
+                                   pkgCache::VerIterator &/*Ver*/) {return true;};

 
 

-   ListParser() : FoundFileDeps(false) {};
-   virtual ~ListParser() {};
+   pkgCacheListParser();
+   virtual ~pkgCacheListParser();

 };
                                                                        /*}}}*/
 
 };
                                                                        /*}}}*/