* cleanups

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

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index ff397bfacf5e3c671039cd2304dd93ca7d6a878f..7d092062929b892bdf6250430ba8b056100419b5 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: pkgcachegen.h,v 1.8 1998/07/21 05:33:20 jgg Exp $
+// $Id: pkgcachegen.h,v 1.19 2002/07/08 03:13:30 jgg Exp $
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
@@ -16,7 +16,6 @@
    
    ##################################################################### */
                                                                        /*}}}*/
-// Header section: pkglib
 #ifndef PKGLIB_PKGCACHEGEN_H
 #define PKGLIB_PKGCACHEGEN_H
 
@@ -25,72 +24,120 @@
 #endif 
 
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/progress.h>
+
+class pkgSourceList;
+class OpProgress;
+class MMap;
+class pkgIndexFile;
 
 class pkgCacheGenerator
 {
+   private:
+   
+   pkgCache::StringItem *UniqHash[26];
+   
    public:
    
    class ListParser;
+   friend class ListParser;
    
    protected:
    
    DynamicMMap &Map;
    pkgCache Cache;
-   OpProgress &Progress;
+   OpProgress *Progress;
    
    string PkgFileName;
    pkgCache::PackageFile *CurrentFile;
+
+   // Flag file dependencies
+   bool FoundFileDeps;
    
    bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg);
    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
    unsigned long NewVersion(pkgCache::VerIterator &Ver,string VerStr,unsigned long Next);
 
-   unsigned long WriteUniqString(const char *S,unsigned int Size);
-   inline unsigned long WriteUniqString(string S) {return WriteUniqString(S);};
-   
    public:
-   
-   // This is the abstract package list parser class.
-   class ListParser
-   {
-      pkgCacheGenerator *Owner;
-      friend pkgCacheGenerator;
-      
-      protected:
-      
-      inline unsigned long WriteUniqString(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(string S) {return Owner->Map.WriteString(S);};
-      inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);};
-      bool NewDepends(pkgCache::VerIterator Ver,string Package,
-                        string Version,unsigned int Op,
-                        unsigned int Type);
-      bool NewProvides(pkgCache::VerIterator Ver,string Package,string Version);
-      
-      public:
-      
-      // These all operate against the current section
-      virtual string Package() = 0;
-      virtual string Version() = 0;
-      virtual bool NewVersion(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 bool Step() = 0;
-      
-      virtual ~ListParser() {};
-   };
-   friend ListParser;
 
-   bool SelectFile(string File,unsigned long Flags = 0);
-   bool MergeList(ListParser &List);
+   unsigned long WriteUniqString(const char *S,unsigned int Size);
+   inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());};
+
+   void DropProgress() {Progress = 0;};
+   bool SelectFile(string File,string Site,pkgIndexFile const &Index,
+                  unsigned long Flags = 0);
+   bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
    inline pkgCache &GetCache() {return Cache;};
+   inline pkgCache::PkgFileIterator GetCurFile() 
+         {return pkgCache::PkgFileIterator(Cache,CurrentFile);};
+
+   bool HasFileDeps() {return FoundFileDeps;};
+   bool MergeFileProvides(ListParser &List);
       
-   pkgCacheGenerator(DynamicMMap &Map,OpProgress &Progress);
+   pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);
    ~pkgCacheGenerator();
 };
 
+// This is the abstract package list parser class.
+class pkgCacheGenerator::ListParser
+{
+   pkgCacheGenerator *Owner;
+   friend class pkgCacheGenerator;
+   
+   // Some cache items
+   pkgCache::VerIterator OldDepVer;
+   map_ptrloc *OldDepLast;
+
+   // Flag file dependencies
+   bool FoundFileDeps;
+      
+   protected:
+
+   inline unsigned long WriteUniqString(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(string S) {return Owner->Map.WriteString(S);};
+   inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);};
+   bool NewDepends(pkgCache::VerIterator Ver,string Package,
+                  string Version,unsigned int Op,
+                  unsigned int Type);
+   bool NewProvides(pkgCache::VerIterator Ver,string Package,string Version);
+   
+   public:
+   
+   // These all operate against the current section
+   virtual string Package() = 0;
+   virtual string Version() = 0;
+   virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;
+   virtual unsigned short VersionHash() = 0;
+   virtual bool UsePackage(pkgCache::PkgIterator Pkg,
+                          pkgCache::VerIterator Ver) = 0;
+   virtual unsigned long Offset() = 0;
+   virtual unsigned long Size() = 0;
+   
+   virtual bool Step() = 0;
+   
+   inline bool HasFileDeps() {return FoundFileDeps;};
+   virtual bool CollectFileProvides(pkgCache &Cache,
+                                   pkgCache::VerIterator Ver) {return true;};
+
+   ListParser() : FoundFileDeps(false) {};
+   virtual ~ListParser() {};
+};
+
+bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
+                       MMap **OutMap = 0,bool AllowMem = false);
+bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap);
+
+#ifdef APT_COMPATIBILITY
+#if APT_COMPATIBILITY != 986
+#warning "Using APT_COMPATIBILITY"
+#endif
+MMap *pkgMakeStatusCacheMem(pkgSourceList &List,OpProgress &Progress)
+{
+   MMap *Map = 0;
+   if (pkgMakeStatusCache(List,Progress,&Map,true) == false)
+      return 0;
+   return Map;
+}
+#endif
+
 #endif