DumpAvail works and apt-cache is complete

Author: jgg
Date: 1998-07-19 04:22:00 GMT
DumpAvail works and apt-cache is complete

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 8c1f7005cf76533a3d7bf414b5a8f2d85292b7cd..f30d9ffe7bdcbe15fed6e5c8db7c923b036d3ef8 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: strutl.cc,v 1.2 1998/07/16 06:08:41 jgg Exp $
+// $Id: strutl.cc,v 1.3 1998/07/19 04:22:08 jgg Exp $

 /* ######################################################################
 
    String Util - Some usefull string functions.
 /* ######################################################################
 
    String Util - Some usefull string functions.


@@ -243,6 +243,25 @@ string SubstVar(string Str,string Subst,string Contents)
    return Temp + string(Str,OldPos);
 }
                                                                        /*}}}*/
    return Temp + string(Str,OldPos);
 }
                                                                        /*}}}*/

+// URItoFileName - Convert the uri into a unique file name             /*{{{*/
+// ---------------------------------------------------------------------
+/* This converts a URI into a safe filename. It quotes all unsafe characters
+   and converts / to _ and removes the scheme identifier. The resulting
+   file name should be unique and never occur again for a different file */
+string URItoFileName(string URI)
+{
+   string::const_iterator I = URI.begin() + URI.find(':') + 1;
+   for (; I < URI.end() && *I == '/'; I++);
+
+   // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF";
+   URI = QuoteString(string(I,URI.end() - I),"\\|{}[]<>\"^~_=!@#$%^&*");
+   string::iterator J = URI.begin();
+   for (; J != URI.end(); J++)
+      if (*J == '/') 
+        *J = '_';
+   return URI;
+}
+                                                                       /*}}}*/

 // Base64Encode - Base64 Encoding routine for short strings            /*{{{*/
 // ---------------------------------------------------------------------
 /* This routine performs a base64 transformation on a string. It was ripped
 // Base64Encode - Base64 Encoding routine for short strings            /*{{{*/
 // ---------------------------------------------------------------------
 /* This routine performs a base64 transformation on a string. It was ripped

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 0aabf01861d79664f71ad07c7d3084fb135a2cbe..b49b1a52dbea678698c055bb375b29cb34ee4849 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: strutl.h,v 1.2 1998/07/09 05:12:35 jgg Exp $
+// $Id: strutl.h,v 1.3 1998/07/19 04:22:09 jgg Exp $

 /* ######################################################################
 
    String Util - These are some usefull string functions
 /* ######################################################################
 
    String Util - These are some usefull string functions


@@ -29,6 +29,7 @@ string SizeToStr(double Bytes);
 string TimeToStr(unsigned long Sec);
 string SubstVar(string Str,string Subst,string Contents);
 string Base64Encode(string Str);
 string TimeToStr(unsigned long Sec);
 string SubstVar(string Str,string Subst,string Contents);
 string Base64Encode(string Str);

+string URItoFileName(string URI);

 
 int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
 inline int stringcmp(const char *A,const char *AEnd,const char *B) {return stringcmp(A,AEnd,B,B+strlen(B));};
 
 int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
 inline int stringcmp(const char *A,const char *AEnd,const char *B) {return stringcmp(A,AEnd,B,B+strlen(B));};

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 20590e971db62803cc139a8e7c7fc85640cc34f8..02b28fa474a3de0993aafaff6d8b6b78fab03fce 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgcache.cc,v 1.7 1998/07/12 23:58:32 jgg Exp $
+// $Id: pkgcache.cc,v 1.8 1998/07/19 04:22:00 jgg Exp $

 /* ######################################################################
    
    Package Cache - Accessor code for the cache
 /* ######################################################################
    
    Package Cache - Accessor code for the cache


@@ -59,6 +59,7 @@ pkgCache::Header::Header()
    VersionCount = 0;
    DependsCount = 0;
    PackageFileCount = 0;
    VersionCount = 0;
    DependsCount = 0;
    PackageFileCount = 0;

+   MaxVerFileSize = 0;

    
    FileList = 0;
    StringList = 0;
    
    FileList = 0;
    StringList = 0;

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 5ff29cfb4b17057d09494f653445a480460026cb..2e695ab7bd926a802207ff13fc41644a3f5858dc 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.6 1998/07/12 23:58:33 jgg Exp $
+// $Id: pkgcache.h,v 1.7 1998/07/19 04:22:01 jgg Exp $

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


@@ -120,7 +120,9 @@ class pkgCache
    Header &Head() {return *HeaderP;};
    inline PkgIterator PkgBegin();
    inline PkgIterator PkgEnd();
    Header &Head() {return *HeaderP;};
    inline PkgIterator PkgBegin();
    inline PkgIterator PkgEnd();

-
+   inline PkgFileIterator FileBegin();
+   inline PkgFileIterator FileEnd();
+   

    pkgCache(MMap &Map);
    virtual ~pkgCache() {};
 };
    pkgCache(MMap &Map);
    virtual ~pkgCache() {};
 };


@@ -152,6 +154,7 @@ struct pkgCache::Header
    // Offsets
    unsigned long FileList;              // struct PackageFile
    unsigned long StringList;            // struct StringItem
    // Offsets
    unsigned long FileList;              // struct PackageFile
    unsigned long StringList;            // struct StringItem

+   unsigned long MaxVerFileSize;

 
    /* Allocation pools, there should be one of these for each structure
       excluding the header */
 
    /* Allocation pools, there should be one of these for each structure
       excluding the header */


@@ -264,5 +267,9 @@ inline pkgCache::PkgIterator pkgCache::PkgBegin()
        {return PkgIterator(*this);};
 inline pkgCache::PkgIterator pkgCache::PkgEnd() 
        {return PkgIterator(*this,PkgP);};
        {return PkgIterator(*this);};
 inline pkgCache::PkgIterator pkgCache::PkgEnd() 
        {return PkgIterator(*this,PkgP);};

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

 
 #endif
 
 #endif

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 452caa74ae62756e0a9ef5f10b1ed1c11e914e21..f5bf5c5891db8a9e6de0ab5ded53476aa3f93eed 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgcachegen.cc,v 1.10 1998/07/16 06:08:38 jgg Exp $
+// $Id: pkgcachegen.cc,v 1.11 1998/07/19 04:22:02 jgg Exp $

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


@@ -170,7 +170,8 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver,
    Ver->FileList = VF.Index();
    VF->Offset = List.Offset();
    VF->Size = List.Size();
    Ver->FileList = VF.Index();
    VF->Offset = List.Offset();
    VF->Size = List.Size();

-      
+   if (Cache.HeaderP->MaxVerFileSize < VF->Size)
+      Cache.HeaderP->MaxVerFileSize = VF->Size;

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -313,7 +314,8 @@ bool pkgCacheGenerator::SelectFile(string File,unsigned long Flags)
    CurrentFile->NextFile = Cache.HeaderP->FileList;
    CurrentFile->Flags = Flags;
    PkgFileName = File;
    CurrentFile->NextFile = Cache.HeaderP->FileList;
    CurrentFile->Flags = Flags;
    PkgFileName = File;

-
+   Cache.HeaderP->FileList = CurrentFile - Cache.PkgFileP;
+   

    if (CurrentFile->FileName == 0)
       return false;
    return true;
    if (CurrentFile->FileName == 0)
       return false;
    return true;

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

-// $Id: pkgcachegen.h,v 1.5 1998/07/12 23:58:35 jgg Exp $
+// $Id: pkgcachegen.h,v 1.6 1998/07/19 04:22:03 jgg Exp $

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


@@ -69,7 +69,7 @@ class pkgCacheGenerator
                              pkgCache::VerIterator Ver) = 0;
       virtual unsigned long Offset() = 0;
       virtual unsigned long Size() = 0;
                              pkgCache::VerIterator Ver) = 0;
       virtual unsigned long Offset() = 0;
       virtual unsigned long Size() = 0;

-
+      

       virtual bool Step() = 0;
       
       virtual ~ListParser() {};
       virtual bool Step() = 0;
       
       virtual ~ListParser() {};


@@ -78,7 +78,8 @@ class pkgCacheGenerator
 
    bool SelectFile(string File,unsigned long Flags = 0);
    bool MergeList(ListParser &List);
 
    bool SelectFile(string File,unsigned long Flags = 0);
    bool MergeList(ListParser &List);

-   
+   inline pkgCache &GetCache() {return Cache;};
+      

    pkgCacheGenerator(DynamicMMap &Map);
    ~pkgCacheGenerator();
 };
    pkgCacheGenerator(DynamicMMap &Map);
    ~pkgCacheGenerator();
 };

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index f9de995848ea3f07321fe267d2538f31d3439450..faae6a3303d1680dfd1ec57b402ad162a203c229 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: sourcelist.cc,v 1.3 1998/07/12 23:58:36 jgg Exp $
+// $Id: sourcelist.cc,v 1.4 1998/07/19 04:22:04 jgg Exp $

 /* ######################################################################
 
    List of Sources
 /* ######################################################################
 
    List of Sources


@@ -108,45 +108,6 @@ bool pkgSourceList::Read(string File)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-// SourceList::SanitizeURI - Hash the uri                              /*{{{*/
-// ---------------------------------------------------------------------
-/* This converts a URI into a safe filename. It quotes all unsafe characters
-   and converts / to _ and removes the scheme identifier. */
-string pkgSourceList::SanitizeURI(string URI)
-{
-   string::const_iterator I = URI.begin() + URI.find(':') + 1;
-   for (; I < URI.end() && *I == '/'; I++);
-
-   // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF";
-   URI = QuoteString(string(I,URI.end() - I),"\\|{}[]<>\"^~_=!@#$%^&*");
-   string::iterator J = URI.begin();
-   for (; J != URI.end(); J++)
-      if (*J == '/') 
-        *J = '_';
-   return URI;
-}
-                                                                       /*}}}*/
-// SourceList::MatchPkgFile - Find the package file that has the ver   /*{{{*/
-// ---------------------------------------------------------------------
-/* This will return List.end() if it could not find the matching 
-   file */
-pkgSourceList::const_iterator pkgSourceList::MatchPkgFile(pkgCache::VerIterator Ver)
-{
-   string Base = _config->Find("APT::Architecture");
-   for (const_iterator I = List.begin(); I != List.end(); I++)
-   {
-      string URI = I->PackagesURI();
-      switch (I->Type)
-      {
-        case Item::Deb:
-/*      if (Base + SanitizeURI(URI) == Ver.File().FileName())
-           return I;*/
-        break;
-      };      
-   }
-   return List.end();
-}
-                                                                       /*}}}*/

 // SourceList::Item << - Writes the item to a stream                   /*{{{*/
 // ---------------------------------------------------------------------
 /* This is not suitable for rebuilding the sourcelist file but it good for
 // SourceList::Item << - Writes the item to a stream                   /*{{{*/
 // ---------------------------------------------------------------------
 /* This is not suitable for rebuilding the sourcelist file but it good for

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 57a648b972272f96251ababe5fd98f3db6c8bd9c..2cf5a6ed220761bb22e34553da6e301e2a17bf9b 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: sourcelist.h,v 1.3 1998/07/12 23:58:38 jgg Exp $
+// $Id: sourcelist.h,v 1.4 1998/07/19 04:22:05 jgg Exp $

 /* ######################################################################
 
    SourceList - Manage a list of sources
 /* ######################################################################
 
    SourceList - Manage a list of sources


@@ -56,8 +56,6 @@ class pkgSourceList
 
    bool ReadMainList();
    bool Read(string File);
 
    bool ReadMainList();
    bool Read(string File);

-   string SanitizeURI(string URI);
-   const_iterator MatchPkgFile(pkgCache::VerIterator Ver);

    
    // List accessors
    inline const_iterator begin() const {return List.begin();};
    
    // List accessors
    inline const_iterator begin() const {return List.begin();};

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 9ae55b7d8323e268cf4df32a23834eca284fbd77..953f8b4a624c2378caf7373c3371e91b88a15ae7 100644 (file)
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -1,11 +1,11 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: tagfile.cc,v 1.8 1998/07/16 06:08:39 jgg Exp $
+// $Id: tagfile.cc,v 1.9 1998/07/19 04:22:06 jgg Exp $

 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
    
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
    

-   This uses a rotating 64K buffer to load the package information into.
+   This uses a rotating buffer to load the package information into.

    The scanner runs over it and isolates and indexes a single section.
    
    ##################################################################### */
    The scanner runs over it and isolates and indexes a single section.
    
    ##################################################################### */


@@ -25,10 +25,10 @@
 // TagFile::pkgTagFile - Constructor                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // TagFile::pkgTagFile - Constructor                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-pkgTagFile::pkgTagFile(File &Fd) : Fd(Fd)
+pkgTagFile::pkgTagFile(File &Fd,unsigned long Size) : Fd(Fd), Size(Size)

 {
 {

-   Buffer = new char[64*1024];
-   Start = End = Buffer + 64*1024;
+   Buffer = new char[Size];
+   Start = End = Buffer;

    Left = Fd.Size();
    iOffset = 0;
    Fill();
    Left = Fd.Size();
    iOffset = 0;
    Fill();


@@ -59,35 +59,56 @@ bool pkgTagFile::Step(pkgTagSection &Tag)
    then fills the rest from the file */
 bool pkgTagFile::Fill()
 {
    then fills the rest from the file */
 bool pkgTagFile::Fill()
 {

-   unsigned long Size = End - Start;
+   unsigned long EndSize = End - Start;

    
    if (Left == 0)
    {
    
    if (Left == 0)
    {

-      if (Size <= 1)
+      if (EndSize <= 1)

         return false;
       return true;
    }
    
         return false;
       return true;
    }
    

-   memmove(Buffer,Start,Size);
+   memmove(Buffer,Start,EndSize);

    Start = Buffer;
    Start = Buffer;

+   End = Buffer + EndSize;

    
    

-   // See if only a bit of the file is left or if 
-   if (Left < End - Buffer - Size)
+   // See if only a bit of the file is left 
+   if (Left < Size)

    {
    {

-      if (Fd.Read(Buffer + Size,Left) == false)
+      if (Fd.Read(End,Left) == false)

         return false;
         return false;

-      End = Buffer + Size + Left;
+      End += Left;

       Left = 0;
    }
    else
    {
       Left = 0;
    }
    else
    {

-      if (Fd.Read(Buffer + Size, End - Buffer - Size) == false)
+      if (Fd.Read(End,Size - (End - Buffer)) == false)

         return false;
         return false;

-      Left -= End - Buffer - Size;
+      Left -= Size - (End - Buffer);
+      End = Buffer + Size;

    }   
    return true;
 }
                                                                        /*}}}*/
    }   
    return true;
 }
                                                                        /*}}}*/

+// TagFile::Jump - Jump to a pre-recorded location in the file         /*{{{*/
+// ---------------------------------------------------------------------
+/* This jumps to a pre-recorded file location and */
+bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
+{
+   iOffset = Offset;
+   Left = Fd.Size() - Offset;
+   if (Fd.Seek(Offset) == false)
+      return false;
+   End = Start = Buffer;
+   
+   if (Fill() == false)
+      return false;
+   
+   if (Tag.Scan(Start,End - Start) == false)
+      return _error->Error("Unable to parse package file");
+   return true;
+}
+                                                                       /*}}}*/

 // TagSection::Scan - Scan for the end of the header information       /*{{{*/
 // ---------------------------------------------------------------------
 /* This looks for the first double new line in the data stream. It also
 // TagSection::Scan - Scan for the end of the header information       /*{{{*/
 // ---------------------------------------------------------------------
 /* This looks for the first double new line in the data stream. It also

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 446b5bf1200515a5c7732441836765dad7fbd07a..8e3dba33d9e435d1efb85b3df9f7424b0782a043 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: tagfile.h,v 1.5 1998/07/16 06:08:40 jgg Exp $
+// $Id: tagfile.h,v 1.6 1998/07/19 04:22:07 jgg Exp $

 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information


@@ -56,6 +56,7 @@ class pkgTagFile
    char *End;
    unsigned long Left;
    unsigned long iOffset;
    char *End;
    unsigned long Left;
    unsigned long iOffset;

+   unsigned long Size;

    
    bool Fill();
    
    
    bool Fill();
    


@@ -63,8 +64,9 @@ class pkgTagFile
 
    bool Step(pkgTagSection &Section);
    inline unsigned long Offset() {return iOffset;};
 
    bool Step(pkgTagSection &Section);
    inline unsigned long Offset() {return iOffset;};

-   
-   pkgTagFile(File &F);
+   bool Jump(pkgTagSection &Tag,unsigned long Offset);
+      
+   pkgTagFile(File &F,unsigned long Size = 32*1024);

 };
 
 #endif
 };
 
 #endif

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index ac5dc17ca19cff93ec1b0e925b1688c3781ede6c..e36bff1984d013080df00baca1e6966f6a09279f 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-cache.cc,v 1.2 1998/07/16 06:08:43 jgg Exp $
+// $Id: apt-cache.cc,v 1.3 1998/07/19 04:22:10 jgg Exp $

 /* ######################################################################
    
    apt-cache - Manages the cache file.
 /* ######################################################################
    
    apt-cache - Manages the cache file.


@@ -62,69 +62,14 @@ bool SplitArg(const char *Arg,string &File,string &Dist,string Ver)
       return _error->Error("Malformed argument %s, must be in file:dist:rev form",Arg);
    Ver = string(Start,I - Start);
 
       return _error->Error("Malformed argument %s, must be in file:dist:rev form",Arg);
    Ver = string(Start,I - Start);
 

-   return true;
-}
-                                                                       /*}}}*/
-// DoAdd - Perform an adding operation                                 /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool DoAdd(int argc,char *argv[])
-{
-   string FileName;
-   string Dist;
-   string Ver;
-   
-   File CacheF(CacheFile,File::WriteEmpty);
-   if (_error->PendingError() == true)
-      return false;
-   
-   DynamicMMap Map(CacheF,MMap::Public);
-   if (_error->PendingError() == true)
-      return false;
-   
-   pkgCacheGenerator Gen(Map);
-   if (_error->PendingError() == true)
-      return false;
-
-   for (int I = 0; I != argc; I++)
-   {
-      if (SplitArg(argv[I],FileName,Dist,Ver) == false)
-        return false;
-      cout << FileName << endl;
-      
-      // Do the merge
-      File TagF(FileName.c_str(),File::ReadOnly);
-      debListParser Parser(TagF);
-      if (_error->PendingError() == true)
-        return _error->Error("Problem opening %s",FileName.c_str());
-      
-      if (Gen.SelectFile(FileName) == false)
-        return _error->Error("Problem with SelectFile");
-        
-      if (Gen.MergeList(Parser) == false)
-        return _error->Error("Problem with MergeList");
-   }
-   

    return true;
 }
                                                                        /*}}}*/
 // DumpPackage - Show a dump of a package record                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
    return true;
 }
                                                                        /*}}}*/
 // DumpPackage - Show a dump of a package record                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool DumpPackage(int argc,char *argv[])
-{
-   File CacheF(CacheFile,File::ReadOnly);
-   if (_error->PendingError() == true)
-      return false;
-   
-   MMap Map(CacheF,MMap::Public | MMap::ReadOnly);
-   if (_error->PendingError() == true)
-      return false;
-   
-   pkgCache Cache(Map);   
-   if (_error->PendingError() == true)
-      return false;
-   
+bool DumpPackage(pkgCache &Cache,int argc,char *argv[])
+{   

    for (int I = 0; I != argc; I++)
    {
       pkgCache::PkgIterator Pkg = Cache.FindPkg(argv[I]);
    for (int I = 0; I != argc; I++)
    {
       pkgCache::PkgIterator Pkg = Cache.FindPkg(argv[I]);


@@ -173,20 +118,8 @@ bool DumpPackage(int argc,char *argv[])
 // Stats - Dump some nice statistics                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Stats - Dump some nice statistics                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool Stats(const char *FileName)
+bool Stats(pkgCache &Cache)

 {
 {

-   File CacheF(FileName,File::ReadOnly);
-   if (_error->PendingError() == true)
-      return false;
-   
-   MMap Map(CacheF,MMap::Public | MMap::ReadOnly);
-   if (_error->PendingError() == true)
-      return false;
-   
-   pkgCache Cache(Map);   
-   if (_error->PendingError() == true)
-      return false;
-       

    cout << "Total Package Names : " << Cache.Head().PackageCount << endl;
    pkgCache::PkgIterator I = Cache.PkgBegin();
    
    cout << "Total Package Names : " << Cache.Head().PackageCount << endl;
    pkgCache::PkgIterator I = Cache.PkgBegin();
    


@@ -240,20 +173,8 @@ bool Stats(const char *FileName)
 // Dump - show everything                                              /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Dump - show everything                                              /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool Dump()
+bool Dump(pkgCache &Cache)

 {
 {

-   File CacheF(CacheFile,File::ReadOnly);
-   if (_error->PendingError() == true)
-      return false;
-   
-   MMap Map(CacheF,MMap::Public | MMap::ReadOnly);
-   if (_error->PendingError() == true)
-      return false;
-   
-   pkgCache Cache(Map);   
-   if (_error->PendingError() == true)
-      return false;
-

    for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
    {
       cout << "Package: " << P.Name() << endl;
    for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
    {
       cout << "Package: " << P.Name() << endl;


@@ -281,53 +202,97 @@ bool Dump()
 // DumpAvail - Print out the available list                            /*{{{*/
 // ---------------------------------------------------------------------
 /* This is needed to make dpkg --merge happy */
 // DumpAvail - Print out the available list                            /*{{{*/
 // ---------------------------------------------------------------------
 /* This is needed to make dpkg --merge happy */

-bool DumpAvail()
+bool DumpAvail(pkgCache &Cache)

 {
 {

-#if 0
-   pkgCache Cache(CacheFile,true,true);
-   if (_error->PendingError() == true)
-      return false;
+   unsigned char *Buffer = new unsigned char[Cache.HeaderP->MaxVerFileSize];

 
 

-   pkgControlCache CCache(Cache);
-   if (_error->PendingError() == true)
-      return false;
-
-   vector<string> Lines;
-   Lines.reserve(30);
-   
-   pkgCache::PkgIterator I = Cache.PkgBegin();
-   for (;I.end() != true; I++)
+   for (pkgCache::PkgFileIterator I = Cache.FileBegin(); I.end() == false; I++)

    {
    {

-      if (I->VersionList == 0)
+      if ((I->Flags & pkgCache::Flag::NotSource) != 0)

         continue;
       
         continue;
       

-      pkgSPkgCtrlInfo Inf = CCache[I.VersionList()];
-      if (Inf.isNull() == true)
-        return _error->Error("Couldn't locate info record");
+      if (I.IsOk() == false)
+      {
+        delete [] Buffer;
+        return _error->Error("Package file %s is out of sync.",I.FileName());
+      }

       
       

-      // Iterate over each element
-      pkgPkgCtrlInfo::const_iterator Elm = Inf->begin();
-      for (; Elm != Inf->end(); Elm++)
+      File PkgF(I.FileName(),File::ReadOnly);
+      if (_error->PendingError() == true)

       {
       {

-        // Write the tag: value
-        cout << (*Elm)->Tag() << ": " << (*Elm)->Value() << endl;
-        
-        // Write the multiline
-        (*Elm)->GetLines(Lines);
-        for (vector<string>::iterator j = Lines.begin(); j != Lines.end(); j++)
+        delete [] Buffer;
+        return false;
+      }
+
+      /* Write all of the records from this package file, we search the entire
+         structure to find them */
+      for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
+      {
+        for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++)

         {
         {

-           if ((*j).length() == 0)
-              cout << " ." << endl;
-           else
-              cout << " " << *j << endl;
+           if (V->FileList == 0)
+              continue;
+           if (V.FileList().File() != I)
+              continue;
+           
+           // Read the record and then write it out again.
+           if (PkgF.Seek(V.FileList()->Offset) == false ||
+               PkgF.Read(Buffer,V.FileList()->Size) == false ||
+               write(STDOUT_FILENO,Buffer,V.FileList()->Size) != V.FileList()->Size)
+           {
+              delete [] Buffer;
+              return false;
+           }       

         }
         }

-        
-        Lines.erase(Lines.begin(),Lines.end());

       }
       }

+   }
+   
+   return true;
+}
+                                                                       /*}}}*/
+// DoAdd - Perform an adding operation                                 /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool DoAdd(int argc,char *argv[])
+{
+   string FileName;
+   string Dist;
+   string Ver;
+   
+   // Open the cache
+   File CacheF(CacheFile,File::WriteEmpty);
+   if (_error->PendingError() == true)
+      return false;
+   
+   DynamicMMap Map(CacheF,MMap::Public);
+   if (_error->PendingError() == true)
+      return false;
+   
+   pkgCacheGenerator Gen(Map);
+   if (_error->PendingError() == true)
+      return false;
+
+   for (int I = 0; I != argc; I++)
+   {
+      if (SplitArg(argv[I],FileName,Dist,Ver) == false)
+        return false;
+      cout << FileName << endl;

       
       

-      cout << endl;
+      // Do the merge
+      File TagF(FileName.c_str(),File::ReadOnly);
+      debListParser Parser(TagF);
+      if (_error->PendingError() == true)
+        return _error->Error("Problem opening %s",FileName.c_str());
+      
+      if (Gen.SelectFile(FileName) == false)
+        return _error->Error("Problem with SelectFile");
+        
+      if (Gen.MergeList(Parser) == false)
+        return _error->Error("Problem with MergeList");

    }
    }

-#endif
+   
+   Stats(Gen.GetCache());
+   

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -344,38 +309,48 @@ int main(int argc, char *argv[])
    pkgInitialize(*_config);
    while (1)
    {
    pkgInitialize(*_config);
    while (1)
    {

+      CacheFile = argv[2];

       if (strcmp(argv[1],"add") == 0)
       {
       if (strcmp(argv[1],"add") == 0)
       {

-        CacheFile = argv[2];
-        if (DoAdd(argc - 3,argv + 3) == true) 
-           Stats(argv[2]);
+        DoAdd(argc - 3,argv + 3);

         break;
       }
         break;
       }

+
+      // Open the cache file
+      File CacheF(CacheFile,File::ReadOnly);
+      if (_error->PendingError() == true)
+        break;
+      
+      MMap Map(CacheF,MMap::Public | MMap::ReadOnly);
+      if (_error->PendingError() == true)
+        break;
+      
+      pkgCache Cache(Map);   
+      if (_error->PendingError() == true)
+        break;

     
       if (strcmp(argv[1],"showpkg") == 0)
       {
         CacheFile = argv[2];
     
       if (strcmp(argv[1],"showpkg") == 0)
       {
         CacheFile = argv[2];

-        DumpPackage(argc - 3,argv + 3);
+        DumpPackage(Cache,argc - 3,argv + 3);

         break;
       }
 
       if (strcmp(argv[1],"stats") == 0)
       {
         break;
       }
 
       if (strcmp(argv[1],"stats") == 0)
       {

-        Stats(argv[2]);
+        Stats(Cache);

         break;
       }
       
       if (strcmp(argv[1],"dump") == 0)
       {
         break;
       }
       
       if (strcmp(argv[1],"dump") == 0)
       {

-        CacheFile = argv[2];
-        Dump();
+        Dump(Cache);

         break;
       }
       
       if (strcmp(argv[1],"dumpavail") == 0)
       {
         break;
       }
       
       if (strcmp(argv[1],"dumpavail") == 0)
       {

-        CacheFile = argv[2];
-        DumpAvail();
+        DumpAvail(Cache);

         break;
       }
       
         break;
       }
       

diff --git a/doc/cache.sgml b/doc/cache.sgml
index dd8ca9277c2cb866af60abf981a2830241dfe5b1..9516af5123584b338c7912b708127a672267d525 100644 (file)
--- a/doc/cache.sgml
+++ b/doc/cache.sgml
@@ -4,7 +4,7 @@
 <title>APT Cache File Format</title>
 
 <author>Jason Gunthorpe <email>jgg@debian.org</email></author>
 <title>APT Cache File Format</title>
 
 <author>Jason Gunthorpe <email>jgg@debian.org</email></author>

-<version>$Id: cache.sgml,v 1.2 1998/07/05 05:43:09 jgg Exp $</version>
+<version>$Id: cache.sgml,v 1.3 1998/07/19 04:22:11 jgg Exp $</version>

 
 <abstract>
 This document describes the complete implementation and format of the APT
 
 <abstract>
 This document describes the complete implementation and format of the APT


@@ -140,6 +140,7 @@ This is the first item in the file.
       unsigned long VersionCount;
       unsigned long DependsCount;
       unsigned long PackageFileCount;
       unsigned long VersionCount;
       unsigned long DependsCount;
       unsigned long PackageFileCount;

+      unsigned long MaxVerFileSize;

       
       // Offsets
       unsigned long FileList;              // PackageFile
       
       // Offsets
       unsigned long FileList;              // PackageFile


@@ -193,6 +194,10 @@ These indicate the number of each structure contianed in the cache.
 PackageCount is especially usefull for generating user state structures. 
 See Package::Id for more info.
 
 PackageCount is especially usefull for generating user state structures. 
 See Package::Id for more info.
 

+<tag>MaxVerFileSize<item>
+The maximum size of a raw entry from the original Package file 
+(ie VerFile::Size) is stored here.
+

 <tag>FileList<item>
 This contains the index of the first PackageFile structure. The PackageFile
 structures are singely linked lists that represent all package files that
 <tag>FileList<item>
 This contains the index of the first PackageFile structure. The PackageFile
 structures are singely linked lists that represent all package files that