Made configure smarter about detecting the previous hp-...

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

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 395afdc83e2692428a496a439b1bd2e235eb38ce..f264b314dceaccf431556aa0af5187c495aaa6fe 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -1,11 +1,18 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgcachegen.h,v 1.3 1998/07/05 05:33:57 jgg Exp $
+// $Id: pkgcachegen.h,v 1.17 1999/07/26 17:46:08 jgg Exp $

 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
    
    This builds the cache structure from the abstract package list parser. 
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
    
    This builds the cache structure from the abstract package list parser. 

+   Each archive source has it's own list parser that is instantiated by
+   the caller to provide data for the generator. 
+   
+   Parts of the cache are created by this generator class while other
+   parts are created by the list parser. The list parser is responsible
+   for creating version, depends and provides structures, and some of
+   their contents

    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/


@@ -13,19 +20,33 @@
 #ifndef PKGLIB_PKGCACHEGEN_H
 #define PKGLIB_PKGCACHEGEN_H
 
 #ifndef PKGLIB_PKGCACHEGEN_H
 #define PKGLIB_PKGCACHEGEN_H
 

-#include <pkglib/pkgcache.h>
+#ifdef __GNUG__
+#pragma interface "apt-pkg/pkgcachegen.h"
+#endif 
+
+#include <apt-pkg/pkgcache.h>
+
+class pkgSourceList;
+class OpProgress;
+class MMap;

 
 class pkgCacheGenerator
 {
 
 class pkgCacheGenerator
 {

+   private:
+   
+   pkgCache::StringItem *UniqHash[26];
+   

    public:
    
    class ListParser;
    public:
    
    class ListParser;

+   friend ListParser;

    
    protected:
    
    DynamicMMap &Map;
    pkgCache Cache;
    
    protected:
    
    DynamicMMap &Map;
    pkgCache Cache;

-
+   OpProgress *Progress;
+   

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


@@ -34,49 +55,66 @@ class pkgCacheGenerator
    unsigned long NewVersion(pkgCache::VerIterator &Ver,string VerStr,unsigned long Next);
 
    unsigned long WriteUniqString(const char *S,unsigned int Size);
    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:
+   inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());};
+
+   public:   
+
+   void DropProgress() {Progress = 0;};
+   bool SelectFile(string File,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);};

       
       

-      // 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;
+   pkgCacheGenerator(DynamicMMap &Map,OpProgress &Progress);
+   ~pkgCacheGenerator();
+};
+
+bool pkgSrcCacheCheck(pkgSourceList &List);
+bool pkgPkgCacheCheck(string CacheFile);
+bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress);
+MMap *pkgMakeStatusCacheMem(pkgSourceList &List,OpProgress &Progress);

 
 

-      virtual bool Step() = 0;
+// This is the abstract package list parser class.
+class pkgCacheGenerator::ListParser
+{
+   pkgCacheGenerator *Owner;
+   friend pkgCacheGenerator;
+   
+   // Some cache items
+   pkgCache::VerIterator OldDepVer;
+   map_ptrloc *OldDepLast;

       
       

-      virtual ~ListParser() {};
-   };
-   friend ListParser;
+   protected:

 
 

-   bool SelectFile(string File,unsigned long Flags = 0);
-   bool MergeList(ListParser &List);
+   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);

    
    

-   pkgCacheGenerator(DynamicMMap &Map);
-   ~pkgCacheGenerator();
+   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;
+   
+   virtual ~ListParser() {};

 };
 
 };
 

+bool pkgMergeStatus(OpProgress &Progress,pkgCacheGenerator &Gen,
+                   unsigned long &CurrentSize,unsigned long TotalSize);
+bool pkgAddStatusSize(unsigned long &TotalSize);
+

 #endif
 #endif