debian/control: Set Standards-Version to 3.9.7

[apt.git] / cmdline / apt-cache.cc

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 691899b3e94294ee5046b2e01e11e244d23d7047..4818330848e72af9f1d87320d7d7edb409187881 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.53 2001/12/07 05:57:43 jgg Exp $
+// $Id: apt-cache.cc,v 1.72 2004/04/30 04:34:03 mdz Exp $

 /* ######################################################################
    
    apt-cache - Manages the cache files
 /* ######################################################################
    
    apt-cache - Manages the cache files


@@ -13,180 +13,96 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include<config.h>
+
+#include <apt-pkg/algorithms.h>
+#include <apt-pkg/cachefile.h>
+#include <apt-pkg/cacheset.h>
+#include <apt-pkg/cmndline.h>

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

-#include <apt-pkg/pkgcachegen.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/indexfile.h>

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

+#include <apt-pkg/metaindex.h>
+#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/policy.h>

 #include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>

-#include <apt-pkg/cmndline.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/sptr.h>

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

-#include <apt-pkg/version.h>
-#include <apt-pkg/policy.h>
+#include <apt-pkg/strutl.h>

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

-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/sptr.h>
+#include <apt-pkg/version.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>

 
 

-#include <config.h>
-#include <apti18n.h>
+#include <apt-private/private-cacheset.h>
+#include <apt-private/private-cmndline.h>
+#include <apt-private/private-depends.h>
+#include <apt-private/private-show.h>
+#include <apt-private/private-search.h>
+#include <apt-private/private-unmet.h>
+#include <apt-private/private-main.h>

 
 

-#include <iostream.h>
-#include <unistd.h>
-#include <errno.h>

 #include <regex.h>
 #include <regex.h>

+#include <stddef.h>

 #include <stdio.h>
 #include <stdio.h>

-                                                                       /*}}}*/
-
-pkgCache *GCache = 0;
-pkgSourceList *SrcList = 0;
-
-// LocalitySort - Sort a version list by package file locality         /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-int LocalityCompare(const void *a, const void *b)
-{
-   pkgCache::VerFile *A = *(pkgCache::VerFile **)a;
-   pkgCache::VerFile *B = *(pkgCache::VerFile **)b;
-   
-   if (A == 0 && B == 0)
-      return 0;
-   if (A == 0)
-      return 1;
-   if (B == 0)
-      return -1;
-   
-   if (A->File == B->File)
-      return A->Offset - B->Offset;
-   return A->File - B->File;
-}
+#include <stdlib.h>
+#include <unistd.h>
+#include <algorithm>
+#include <cstring>
+#include <iomanip>
+#include <iostream>
+#include <list>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>

 
 

-void LocalitySort(pkgCache::VerFile **begin,
-                 unsigned long Count,size_t Size)
-{   
-   qsort(begin,Count,Size,LocalityCompare);
-}
+#include <apti18n.h>

                                                                        /*}}}*/
                                                                        /*}}}*/

-// UnMet - Show unmet dependencies                                     /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool UnMet(CommandLine &CmdL)
-{
-   pkgCache &Cache = *GCache;
-   bool Important = _config->FindB("APT::Cache::Important",false);
-   
-   for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
-   {
-      for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++)
-      {
-        bool Header = false;
-        for (pkgCache::DepIterator D = V.DependsList(); D.end() == false;)
-        {
-           // Collect or groups
-           pkgCache::DepIterator Start;
-           pkgCache::DepIterator End;
-           D.GlobOr(Start,End);
-           
-           // Skip conflicts and replaces
-           if (End->Type != pkgCache::Dep::PreDepends &&
-               End->Type != pkgCache::Dep::Depends && 
-               End->Type != pkgCache::Dep::Suggests &&
-               End->Type != pkgCache::Dep::Recommends)
-              continue;
-
-           // Important deps only
-           if (Important == true)
-              if (End->Type != pkgCache::Dep::PreDepends &&
-                  End->Type != pkgCache::Dep::Depends)
-                 continue;
-           
-           // Verify the or group
-           bool OK = false;
-           pkgCache::DepIterator RealStart = Start;
-           do
-           {
-              // See if this dep is Ok
-              pkgCache::Version **VList = Start.AllTargets();
-              if (*VList != 0)
-              {
-                 OK = true;
-                 delete [] VList;
-                 break;
-              }
-              delete [] VList;
-              
-              if (Start == End)
-                 break;
-              Start++;
-           }
-           while (1);

 
 

-           // The group is OK
-           if (OK == true)
-              continue;
-           
-           // Oops, it failed..
-           if (Header == false)
-              ioprintf(cout,_("Package %s version %s has an unmet dep:\n"),
-                       P.Name(),V.VerStr());
-           Header = true;
-           
-           // Print out the dep type
-           cout << " " << End.DepType() << ": ";
+using namespace std;

 
 

-           // Show the group
-           Start = RealStart;
-           do
-           {
-              cout << Start.TargetPkg().Name();
-              if (Start.TargetVer() != 0)
-                 cout << " (" << Start.CompType() << " " << Start.TargetVer() <<
-                 ")";
-              if (Start == End)
-                 break;
-              cout << " | ";
-              Start++;
-           }
-           while (1);
-           
-           cout << endl;
-        }       
-      }
-   }   
-   return true;
-}
-                                                                       /*}}}*/

 // DumpPackage - Show a dump of a package record                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // DumpPackage - Show a dump of a package record                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool DumpPackage(CommandLine &CmdL)
-{   
-   pkgCache &Cache = *GCache;
-   for (const char **I = CmdL.FileList + 1; *I != 0; I++)
-   {
-      pkgCache::PkgIterator Pkg = Cache.FindPkg(*I);
-      if (Pkg.end() == true)
-      {
-        _error->Warning(_("Unable to locate package %s"),*I);
-        continue;
-      }
+static bool DumpPackage(CommandLine &CmdL)
+{
+   pkgCacheFile CacheFile;
+   APT::CacheSetHelper helper(true, GlobalError::NOTICE);
+   APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1, helper);

 
 

-      cout << "Package: " << Pkg.Name() << endl;
+   for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+   {
+      cout << "Package: " << Pkg.FullName(true) << endl;

       cout << "Versions: " << endl;
       cout << "Versions: " << endl;

-      for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++)
+      for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; ++Cur)

       {
         cout << Cur.VerStr();
       {
         cout << Cur.VerStr();

-        for (pkgCache::VerFileIterator Vf = Cur.FileList(); Vf.end() == false; Vf++)
-           cout << "(" << Vf.File().FileName() << ")";
+        for (pkgCache::VerFileIterator Vf = Cur.FileList(); Vf.end() == false; ++Vf)
+           cout << " (" << Vf.File().FileName() << ")";
+        cout << endl;
+        for (pkgCache::DescIterator D = Cur.DescriptionList(); D.end() == false; ++D)
+        {
+           cout << " Description Language: " << D.LanguageCode() << endl
+                << "                 File: " << D.FileList().File().FileName() << endl
+                << "                  MD5: " << D.md5() << endl;
+        }

         cout << endl;
       }
       
       cout << endl;
       
       cout << "Reverse Depends: " << endl;
         cout << endl;
       }
       
       cout << endl;
       
       cout << "Reverse Depends: " << endl;

-      for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() != true; D++)
+      for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() != true; ++D)

       {
       {

-        cout << "  " << D.ParentPkg().Name() << ',' << D.TargetPkg().Name();
+        cout << "  " << D.ParentPkg().FullName(true) << ',' << D.TargetPkg().FullName(true);

         if (D->Version != 0)
            cout << ' ' << DeNull(D.TargetVer()) << endl;
         else
         if (D->Version != 0)
            cout << ' ' << DeNull(D.TargetVer()) << endl;
         else


@@ -194,46 +110,102 @@ bool DumpPackage(CommandLine &CmdL)
       }
       
       cout << "Dependencies: " << endl;
       }
       
       cout << "Dependencies: " << endl;

-      for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++)
+      for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; ++Cur)

       {
         cout << Cur.VerStr() << " - ";
       {
         cout << Cur.VerStr() << " - ";

-        for (pkgCache::DepIterator Dep = Cur.DependsList(); Dep.end() != true; Dep++)
-           cout << Dep.TargetPkg().Name() << " (" << (int)Dep->CompareOp << " " << DeNull(Dep.TargetVer()) << ") ";
+        for (pkgCache::DepIterator Dep = Cur.DependsList(); Dep.end() != true; ++Dep)
+           cout << Dep.TargetPkg().FullName(true) << " (" << (int)Dep->CompareOp << " " << DeNull(Dep.TargetVer()) << ") ";

         cout << endl;
       }      
 
       cout << "Provides: " << endl;
         cout << endl;
       }      
 
       cout << "Provides: " << endl;

-      for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++)
+      for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; ++Cur)

       {
         cout << Cur.VerStr() << " - ";
       {
         cout << Cur.VerStr() << " - ";

-        for (pkgCache::PrvIterator Prv = Cur.ProvidesList(); Prv.end() != true; Prv++)
-           cout << Prv.ParentPkg().Name() << " ";
+        for (pkgCache::PrvIterator Prv = Cur.ProvidesList(); Prv.end() != true; ++Prv)
+           cout << Prv.ParentPkg().FullName(true) << " (= " << (Prv->ProvideVersion == 0 ? "" : Prv.ProvideVersion()) << ") ";

         cout << endl;
       }
       cout << "Reverse Provides: " << endl;
         cout << endl;
       }
       cout << "Reverse Provides: " << endl;

-      for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); Prv.end() != true; Prv++)
-        cout << Prv.OwnerPkg().Name() << " " << Prv.OwnerVer().VerStr() << endl;            
+      for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); Prv.end() != true; ++Prv)
+        cout << Prv.OwnerPkg().FullName(true) << " " << Prv.OwnerVer().VerStr()  << " (= " << (Prv->ProvideVersion == 0 ? "" : Prv.ProvideVersion()) << ")"<< endl;

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

+// ShowHashTableStats - Show stats about a hashtable                   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+static map_pointer_t PackageNext(pkgCache::Package const * const P) { return P->NextPackage; }
+static map_pointer_t GroupNext(pkgCache::Group const * const G) { return G->Next; }
+template<class T>
+static void ShowHashTableStats(std::string Type,
+                               T *StartP,
+                               map_pointer_t *Hashtable,
+                               unsigned long Size,
+                              map_pointer_t(*Next)(T const * const))
+{
+   // hashtable stats for the HashTable
+   unsigned long NumBuckets = Size;
+   unsigned long UsedBuckets = 0;
+   unsigned long UnusedBuckets = 0;
+   unsigned long LongestBucket = 0;
+   unsigned long ShortestBucket = NumBuckets;
+   unsigned long Entries = 0;
+   for (unsigned int i=0; i < NumBuckets; ++i)
+   {
+      T *P = StartP + Hashtable[i];
+      if(P == 0 || P == StartP)
+      {
+         ++UnusedBuckets;
+         continue;
+      }
+      ++UsedBuckets;
+      unsigned long ThisBucketSize = 0;
+      for (; P != StartP; P = StartP + Next(P))
+         ++ThisBucketSize;
+      Entries += ThisBucketSize;
+      LongestBucket = std::max(ThisBucketSize, LongestBucket);
+      ShortestBucket = std::min(ThisBucketSize, ShortestBucket);
+   }
+   cout << "Total buckets in " << Type << ": " << NumBuckets << std::endl;
+   cout << "  Unused: " << UnusedBuckets << std::endl;
+   cout << "  Used: " << UsedBuckets  << std::endl;
+   cout << "  Utilization: " << 100.0 * UsedBuckets/NumBuckets << "%" << std::endl;
+   cout << "  Average entries: " << Entries/(double)UsedBuckets << std::endl;
+   cout << "  Longest: " << LongestBucket << std::endl;
+   cout << "  Shortest: " << ShortestBucket << std::endl;
+}
+                                                                       /*}}}*/

 // Stats - Dump some nice statistics                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Stats - Dump some nice statistics                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool Stats(CommandLine &Cmd)
+static bool Stats(CommandLine &CmdL)

 {
 {

-   pkgCache &Cache = *GCache;
-   cout << _("Total Package Names : ") << Cache.Head().PackageCount << " (" <<
-      SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl;
+   if (CmdL.FileSize() > 1) {
+      _error->Error(_("apt-cache stats does not take any arguments"));
+      return false;
+   }
+
+   pkgCacheFile CacheFile;
+   pkgCache *Cache = CacheFile.GetPkgCache();
+
+   if (unlikely(Cache == NULL))
+      return false;
+
+   cout << _("Total package names: ") << Cache->Head().GroupCount << " (" <<
+      SizeToStr(Cache->Head().GroupCount*Cache->Head().GroupSz) << ')' << endl
+        << _("Total package structures: ") << Cache->Head().PackageCount << " (" <<
+      SizeToStr(Cache->Head().PackageCount*Cache->Head().PackageSz) << ')' << endl;

 
    int Normal = 0;
    int Virtual = 0;
    int NVirt = 0;
    int DVirt = 0;
    int Missing = 0;
 
    int Normal = 0;
    int Virtual = 0;
    int NVirt = 0;
    int DVirt = 0;
    int Missing = 0;

-   pkgCache::PkgIterator I = Cache.PkgBegin();
-   for (;I.end() != true; I++)
+   pkgCache::PkgIterator I = Cache->PkgBegin();
+   for (;I.end() != true; ++I)

    {
       if (I->VersionList != 0 && I->ProvidesList == 0)
       {
    {
       if (I->VersionList != 0 && I->ProvidesList == 0)
       {


@@ -264,99 +236,158 @@ bool Stats(CommandLine &Cmd)
         continue;
       }
    }
         continue;
       }
    }

-   cout << _("  Normal Packages: ") << Normal << endl;
-   cout << _("  Pure Virtual Packages: ") << Virtual << endl;
-   cout << _("  Single Virtual Packages: ") << DVirt << endl;
-   cout << _("  Mixed Virtual Packages: ") << NVirt << endl;
+   cout << _("  Normal packages: ") << Normal << endl;
+   cout << _("  Pure virtual packages: ") << Virtual << endl;
+   cout << _("  Single virtual packages: ") << DVirt << endl;
+   cout << _("  Mixed virtual packages: ") << NVirt << endl;

    cout << _("  Missing: ") << Missing << endl;
    cout << _("  Missing: ") << Missing << endl;

-   
-   cout << _("Total Distinct Versions: ") << Cache.Head().VersionCount << " (" <<
-      SizeToStr(Cache.Head().VersionCount*Cache.Head().VersionSz) << ')' << endl;
-   cout << _("Total Dependencies: ") << Cache.Head().DependsCount << " (" << 
-      SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl;
-   
-   cout << _("Total Ver/File relations: ") << Cache.Head().VerFileCount << " (" <<
-      SizeToStr(Cache.Head().VerFileCount*Cache.Head().VerFileSz) << ')' << endl;
-   cout << _("Total Provides Mappings: ") << Cache.Head().ProvidesCount << " (" <<
-      SizeToStr(Cache.Head().ProvidesCount*Cache.Head().ProvidesSz) << ')' << endl;
-   
-   // String list stats
-   unsigned long Size = 0;
-   unsigned long Count = 0;
-   for (pkgCache::StringItem *I = Cache.StringItemP + Cache.Head().StringList;
-        I!= Cache.StringItemP; I = Cache.StringItemP + I->NextItem)
-   {
-      Count++;
-      Size += strlen(Cache.StrP + I->String) + 1;
-   }
-   cout << _("Total Globbed Strings: ") << Count << " (" << SizeToStr(Size) << ')' << endl;

 
 

-   unsigned long DepVerSize = 0;
-   for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
+   cout << _("Total distinct versions: ") << Cache->Head().VersionCount << " (" <<
+      SizeToStr(Cache->Head().VersionCount*Cache->Head().VersionSz) << ')' << endl;
+   cout << _("Total distinct descriptions: ") << Cache->Head().DescriptionCount << " (" <<
+      SizeToStr(Cache->Head().DescriptionCount*Cache->Head().DescriptionSz) << ')' << endl;
+   cout << _("Total dependencies: ") << Cache->Head().DependsCount << "/" << Cache->Head().DependsDataCount << " (" <<
+      SizeToStr((Cache->Head().DependsCount*Cache->Head().DependencySz) +
+           (Cache->Head().DependsDataCount*Cache->Head().DependencyDataSz)) << ')' << endl;
+   cout << _("Total ver/file relations: ") << Cache->Head().VerFileCount << " (" <<
+      SizeToStr(Cache->Head().VerFileCount*Cache->Head().VerFileSz) << ')' << endl;
+   cout << _("Total Desc/File relations: ") << Cache->Head().DescFileCount << " (" <<
+      SizeToStr(Cache->Head().DescFileCount*Cache->Head().DescFileSz) << ')' << endl;
+   cout << _("Total Provides mappings: ") << Cache->Head().ProvidesCount << " (" <<
+      SizeToStr(Cache->Head().ProvidesCount*Cache->Head().ProvidesSz) << ')' << endl;
+
+   // String list stats
+   std::set<map_stringitem_t> stritems;
+   for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G)
+      stritems.insert(G->Name);
+   for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; ++P)

    {
    {

-      for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++)
+      stritems.insert(P->Arch);
+      for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; ++V)

       {
       {

-        for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++)
+        if (V->VerStr != 0)
+           stritems.insert(V->VerStr);
+        if (V->Section != 0)
+           stritems.insert(V->Section);
+        stritems.insert(V->SourcePkgName);
+        stritems.insert(V->SourceVerStr);
+        for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; ++D)

         {
            if (D->Version != 0)
         {
            if (D->Version != 0)

-              DepVerSize += strlen(D.TargetVer()) + 1;
+              stritems.insert(D->Version);

         }
         }

+        for (pkgCache::DescIterator D = V.DescriptionList(); D.end() == false; ++D)
+        {
+           stritems.insert(D->md5sum);
+           stritems.insert(D->language_code);
+        }
+      }
+      for (pkgCache::PrvIterator Prv = P.ProvidesList(); Prv.end() == false; ++Prv)
+      {
+        if (Prv->ProvideVersion != 0)
+           stritems.insert(Prv->ProvideVersion);

       }
    }
       }
    }

-   cout << _("Total Dependency Version space: ") << SizeToStr(DepVerSize) << endl;
-   
+   for (pkgCache::RlsFileIterator F = Cache->RlsFileBegin(); F != Cache->RlsFileEnd(); ++F)
+   {
+      stritems.insert(F->FileName);
+      stritems.insert(F->Archive);
+      stritems.insert(F->Codename);
+      stritems.insert(F->Version);
+      stritems.insert(F->Origin);
+      stritems.insert(F->Label);
+      stritems.insert(F->Site);
+   }
+   for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); ++F)
+   {
+      stritems.insert(F->FileName);
+      stritems.insert(F->Architecture);
+      stritems.insert(F->Component);
+      stritems.insert(F->IndexType);
+   }
+
+   unsigned long Size = 0;
+   for (std::set<map_stringitem_t>::const_iterator i = stritems.begin(); i != stritems.end(); ++i)
+      Size += strlen(Cache->StrP + *i) + 1;
+   cout << _("Total globbed strings: ") << stritems.size() << " (" << SizeToStr(Size) << ')' << endl;
+   stritems.clear();
+

    unsigned long Slack = 0;
    for (int I = 0; I != 7; I++)
    unsigned long Slack = 0;
    for (int I = 0; I != 7; I++)

-      Slack += Cache.Head().Pools[I].ItemSize*Cache.Head().Pools[I].Count;
-   cout << _("Total Slack space: ") << SizeToStr(Slack) << endl;
-   
+      Slack += Cache->Head().Pools[I].ItemSize*Cache->Head().Pools[I].Count;
+   cout << _("Total slack space: ") << SizeToStr(Slack) << endl;
+

    unsigned long Total = 0;
    unsigned long Total = 0;

-   Total = Slack + Size + Cache.Head().DependsCount*Cache.Head().DependencySz + 
-           Cache.Head().VersionCount*Cache.Head().VersionSz +
-           Cache.Head().PackageCount*Cache.Head().PackageSz + 
-           Cache.Head().VerFileCount*Cache.Head().VerFileSz +
-           Cache.Head().ProvidesCount*Cache.Head().ProvidesSz;
-   cout << _("Total Space Accounted for: ") << SizeToStr(Total) << endl;
-   
+#define APT_CACHESIZE(X,Y) (Cache->Head().X * Cache->Head().Y)
+   Total = Slack + Size +
+      APT_CACHESIZE(GroupCount, GroupSz) +
+      APT_CACHESIZE(PackageCount, PackageSz) +
+      APT_CACHESIZE(VersionCount, VersionSz) +
+      APT_CACHESIZE(DescriptionCount, DescriptionSz) +
+      APT_CACHESIZE(DependsCount, DependencySz) +
+      APT_CACHESIZE(DependsDataCount, DependencyDataSz) +
+      APT_CACHESIZE(ReleaseFileCount, ReleaseFileSz) +
+      APT_CACHESIZE(PackageFileCount, PackageFileSz) +
+      APT_CACHESIZE(VerFileCount, VerFileSz) +
+      APT_CACHESIZE(DescFileCount, DescFileSz) +
+      APT_CACHESIZE(ProvidesCount, ProvidesSz) +
+      (2 * Cache->Head().GetHashTableSize() * sizeof(map_id_t));
+   cout << _("Total space accounted for: ") << SizeToStr(Total) << endl;
+#undef APT_CACHESIZE
+
+   // hashtable stats
+   ShowHashTableStats<pkgCache::Package>("PkgHashTable", Cache->PkgP, Cache->Head().PkgHashTableP(), Cache->Head().GetHashTableSize(), PackageNext);
+   ShowHashTableStats<pkgCache::Group>("GrpHashTable", Cache->GrpP, Cache->Head().GrpHashTableP(), Cache->Head().GetHashTableSize(), GroupNext);
+

    return true;
 }
                                                                        /*}}}*/
 // Dump - show everything                                              /*{{{*/
 // ---------------------------------------------------------------------
 /* This is worthless except fer debugging things */
    return true;
 }
                                                                        /*}}}*/
 // Dump - show everything                                              /*{{{*/
 // ---------------------------------------------------------------------
 /* This is worthless except fer debugging things */

-bool Dump(CommandLine &Cmd)
+static bool Dump(CommandLine &)

 {
 {

-   pkgCache &Cache = *GCache;
-   cout << "Using Versioning System: " << Cache.VS->Label << endl;
+   pkgCacheFile CacheFile;
+   pkgCache *Cache = CacheFile.GetPkgCache();
+   if (unlikely(Cache == NULL))
+      return false;
+
+   std::cout << "Using Versioning System: " << Cache->VS->Label << std::endl;

    
    

-   for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
+   for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; ++P)

    {
    {

-      cout << "Package: " << P.Name() << endl;
-      for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++)
+      std::cout << "Package: " << P.FullName(true) << std::endl;
+      for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; ++V)

       {
       {

-        cout << " Version: " << V.VerStr() << endl;
-        cout << "     File: " << V.FileList().File().FileName() << endl;
-        for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++)
-           cout << "  Depends: " << D.TargetPkg().Name() << ' ' << 
-                            DeNull(D.TargetVer()) << endl;
+        std::cout << " Version: " << V.VerStr() << std::endl;
+        std::cout << "     File: " << V.FileList().File().FileName() << std::endl;
+        for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; ++D)
+           std::cout << "  Depends: " << D.TargetPkg().FullName(true) << ' ' << 
+                            DeNull(D.TargetVer()) << std::endl;
+        for (pkgCache::DescIterator D = V.DescriptionList(); D.end() == false; ++D)
+        {
+           std::cout << " Description Language: " << D.LanguageCode() << std::endl
+                << "                 File: " << D.FileList().File().FileName() << std::endl
+                << "                  MD5: " << D.md5() << std::endl;
+        } 

       }      
    }
 
       }      
    }
 

-   for (pkgCache::PkgFileIterator F = Cache.FileBegin(); F.end() == false; F++)
+   for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F.end() == false; ++F)

    {
    {

-      cout << "File: " << F.FileName() << endl;
-      cout << " Type: " << F.IndexType() << endl;
-      cout << " Size: " << F->Size << endl;
-      cout << " ID: " << F->ID << endl;
-      cout << " Flags: " << F->Flags << endl;
-      cout << " Time: " << TimeRFC1123(F->mtime) << endl;
-      cout << " Archive: " << DeNull(F.Archive()) << endl;
-      cout << " Component: " << DeNull(F.Component()) << endl;
-      cout << " Version: " << DeNull(F.Version()) << endl;
-      cout << " Origin: " << DeNull(F.Origin()) << endl;
-      cout << " Site: " << DeNull(F.Site()) << endl;
-      cout << " Label: " << DeNull(F.Label()) << endl;
-      cout << " Architecture: " << DeNull(F.Architecture()) << endl;
+      std::cout << "File: " << F.FileName() << std::endl;
+      std::cout << " Type: " << F.IndexType() << std::endl;
+      std::cout << " Size: " << F->Size << std::endl;
+      std::cout << " ID: " << F->ID << std::endl;
+      std::cout << " Flags: " << F->Flags << std::endl;
+      std::cout << " Time: " << TimeRFC1123(F->mtime) << std::endl;
+      std::cout << " Archive: " << DeNull(F.Archive()) << std::endl;
+      std::cout << " Component: " << DeNull(F.Component()) << std::endl;
+      std::cout << " Version: " << DeNull(F.Version()) << std::endl;
+      std::cout << " Origin: " << DeNull(F.Origin()) << std::endl;
+      std::cout << " Site: " << DeNull(F.Site()) << std::endl;
+      std::cout << " Label: " << DeNull(F.Label()) << std::endl;
+      std::cout << " Architecture: " << DeNull(F.Architecture()) << std::endl;

    }
 
    return true;
    }
 
    return true;


@@ -366,20 +397,19 @@ bool Dump(CommandLine &Cmd)
 // ---------------------------------------------------------------------
 /* This is needed to make dpkg --merge happy.. I spent a bit of time to 
    make this run really fast, perhaps I went a little overboard.. */
 // ---------------------------------------------------------------------
 /* This is needed to make dpkg --merge happy.. I spent a bit of time to 
    make this run really fast, perhaps I went a little overboard.. */

-bool DumpAvail(CommandLine &Cmd)
+static bool DumpAvail(CommandLine &)

 {
 {

-   pkgCache &Cache = *GCache;
-
-   pkgPolicy Plcy(&Cache);
-   if (ReadPinFile(Plcy) == false)
+   pkgCacheFile CacheFile;
+   pkgCache *Cache = CacheFile.GetPkgCache();
+   if (unlikely(Cache == NULL || CacheFile.BuildPolicy() == false))

       return false;
       return false;

-   
-   unsigned long Count = Cache.HeaderP->PackageCount+1;
+
+   unsigned long Count = Cache->HeaderP->PackageCount+1;

    pkgCache::VerFile **VFList = new pkgCache::VerFile *[Count];
    memset(VFList,0,sizeof(*VFList)*Count);
    
    // Map versions that we want to write out onto the VerList array.
    pkgCache::VerFile **VFList = new pkgCache::VerFile *[Count];
    memset(VFList,0,sizeof(*VFList)*Count);
    
    // Map versions that we want to write out onto the VerList array.

-   for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
+   for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; ++P)

    {    
       if (P->VersionList == 0)
         continue;
    {    
       if (P->VersionList == 0)
         continue;


@@ -387,7 +417,7 @@ bool DumpAvail(CommandLine &Cmd)
       /* Find the proper version to use. If the policy says there are no
          possible selections we return the installed version, if available..
                 This prevents dselect from making it obsolete. */
       /* Find the proper version to use. If the policy says there are no
          possible selections we return the installed version, if available..
                 This prevents dselect from making it obsolete. */

-      pkgCache::VerIterator V = Plcy.GetCandidateVer(P);
+      pkgCache::VerIterator V = CacheFile.GetPolicy()->GetCandidateVer(P);

       if (V.end() == true)
       {
         if (P->CurrentVer == 0)
       if (V.end() == true)
       {
         if (P->CurrentVer == 0)


@@ -396,7 +426,7 @@ bool DumpAvail(CommandLine &Cmd)
       }
       
       pkgCache::VerFileIterator VF = V.FileList();
       }
       
       pkgCache::VerFileIterator VF = V.FileList();

-      for (; VF.end() == false ; VF++)
+      for (; VF.end() == false ; ++VF)

         if ((VF.File()->Flags & pkgCache::Flag::NotSource) == 0)
            break;
       
         if ((VF.File()->Flags & pkgCache::Flag::NotSource) == 0)
            break;
       


@@ -410,9 +440,9 @@ bool DumpAvail(CommandLine &Cmd)
          handling works OK. */
       if (VF.end() == true)
       {
          handling works OK. */
       if (VF.end() == true)
       {

-        for (pkgCache::VerIterator Cur = P.VersionList(); Cur.end() != true; Cur++)
+        for (pkgCache::VerIterator Cur = P.VersionList(); Cur.end() != true; ++Cur)

         {
         {

-           for (VF = Cur.FileList(); VF.end() == false; VF++)
+           for (VF = Cur.FileList(); VF.end() == false; ++VF)

            {    
               if ((VF.File()->Flags & pkgCache::Flag::NotSource) == 0)
               {
            {    
               if ((VF.File()->Flags & pkgCache::Flag::NotSource) == 0)
               {


@@ -431,18 +461,24 @@ bool DumpAvail(CommandLine &Cmd)
    
    LocalitySort(VFList,Count,sizeof(*VFList));
 
    
    LocalitySort(VFList,Count,sizeof(*VFList));
 

+   std::vector<pkgTagSection::Tag> RW;
+   RW.push_back(pkgTagSection::Tag::Remove("Status"));
+   RW.push_back(pkgTagSection::Tag::Remove("Config-Version"));
+   FileFd stdoutfd;
+   stdoutfd.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly, false);
+

    // Iterate over all the package files and write them out.
    // Iterate over all the package files and write them out.

-   char *Buffer = new char[Cache.HeaderP->MaxVerFileSize+10];
+   char *Buffer = new char[Cache->HeaderP->MaxVerFileSize+10];

    for (pkgCache::VerFile **J = VFList; *J != 0;)
    {
    for (pkgCache::VerFile **J = VFList; *J != 0;)
    {

-      pkgCache::PkgFileIterator File(Cache,(*J)->File + Cache.PkgFileP);
+      pkgCache::PkgFileIterator File(*Cache,(*J)->File + Cache->PkgFileP);

       if (File.IsOk() == false)
       {
         _error->Error(_("Package file %s is out of sync."),File.FileName());
         break;
       }
 
       if (File.IsOk() == false)
       {
         _error->Error(_("Package file %s is out of sync."),File.FileName());
         break;
       }
 

-      FileFd PkgF(File.FileName(),FileFd::ReadOnly);
+      FileFd PkgF(File.FileName(),FileFd::ReadOnly, FileFd::Extension);

       if (_error->PendingError() == true)
         break;
       
       if (_error->PendingError() == true)
         break;
       


@@ -454,7 +490,7 @@ bool DumpAvail(CommandLine &Cmd)
       unsigned long Pos = 0;
       for (; *J != 0; J++)
       {
       unsigned long Pos = 0;
       for (; *J != 0; J++)
       {

-        if ((*J)->File + Cache.PkgFileP != File)
+        if ((*J)->File + Cache->PkgFileP != File)

            break;
         
         const pkgCache::VerFile &VF = **J;
            break;
         
         const pkgCache::VerFile &VF = **J;


@@ -471,117 +507,245 @@ bool DumpAvail(CommandLine &Cmd)
         if (PkgF.Read(Buffer,VF.Size + Jitter) == false)
            break;
         Buffer[VF.Size + Jitter] = '\n';
         if (PkgF.Read(Buffer,VF.Size + Jitter) == false)
            break;
         Buffer[VF.Size + Jitter] = '\n';

-        
+

         // See above..
         if ((File->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource)
         {
            pkgTagSection Tags;
         // See above..
         if ((File->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource)
         {
            pkgTagSection Tags;

-           TFRewriteData RW[] = {{"Status",0},{"Config-Version",0},{}};
-           const char *Zero = 0;

            if (Tags.Scan(Buffer+Jitter,VF.Size+1) == false ||
            if (Tags.Scan(Buffer+Jitter,VF.Size+1) == false ||

-               TFRewrite(stdout,Tags,&Zero,RW) == false)
+               Tags.Write(stdoutfd, NULL, RW) == false ||
+               stdoutfd.Write("\n", 1) == false)

            {
               _error->Error("Internal Error, Unable to parse a package record");
               break;
            }
            {
               _error->Error("Internal Error, Unable to parse a package record");
               break;
            }

-           fputc('\n',stdout);

         }
         else
         {
         }
         else
         {

-           if (fwrite(Buffer+Jitter,VF.Size+1,1,stdout) != 1)
+           if (stdoutfd.Write(Buffer + Jitter, VF.Size + 1) == false)

               break;
         }
               break;
         }

-        
+

         Pos = VF.Offset + VF.Size;
       }
 
         Pos = VF.Offset + VF.Size;
       }
 

-      fflush(stdout);

       if (_error->PendingError() == true)
          break;
    }
       if (_error->PendingError() == true)
          break;
    }

-   
+

    delete [] Buffer;
    delete [] VFList;
    return !_error->PendingError();
 }
                                                                        /*}}}*/
    delete [] Buffer;
    delete [] VFList;
    return !_error->PendingError();
 }
                                                                        /*}}}*/

-// Depends - Print out a dependency tree                               /*{{{*/
+// xvcg - Generate a graph for xvcg                                    /*{{{*/

 // ---------------------------------------------------------------------
 // ---------------------------------------------------------------------

-/* */
-bool Depends(CommandLine &CmdL)
+// Code contributed from Junichi Uekawa <dancer@debian.org> on 20 June 2002.
+
+static bool XVcg(CommandLine &CmdL)

 {
 {

-   pkgCache &Cache = *GCache;
-   SPtrArray<unsigned> Colours = new unsigned[Cache.Head().PackageCount];
-   memset(Colours,0,sizeof(*Colours)*Cache.Head().PackageCount);
+   pkgCacheFile CacheFile;
+   pkgCache *Cache = CacheFile.GetPkgCache();
+   if (unlikely(Cache == NULL))
+      return false;
+
+   bool GivenOnly = _config->FindB("APT::Cache::GivenOnly",false);

    
    

-   for (const char **I = CmdL.FileList + 1; *I != 0; I++)
-   {
-      pkgCache::PkgIterator Pkg = Cache.FindPkg(*I);
-      if (Pkg.end() == true)
+   /* Normal packages are boxes
+      Pure Provides are triangles
+      Mixed are diamonds
+      rhomb are missing packages*/
+   const char *Shapes[] = {"ellipse","triangle","box","rhomb"};
+   
+   /* Initialize the list of packages to show.
+      1 = To Show
+      2 = To Show no recurse
+      3 = Emitted no recurse
+      4 = Emitted
+      0 = None */
+   enum States {None=0, ToShow, ToShowNR, DoneNR, Done};
+   enum TheFlags {ForceNR=(1<<0)};
+   unsigned char *Show = new unsigned char[Cache->Head().PackageCount];
+   unsigned char *Flags = new unsigned char[Cache->Head().PackageCount];
+   unsigned char *ShapeMap = new unsigned char[Cache->Head().PackageCount];
+   
+   // Show everything if no arguments given
+   if (CmdL.FileList[1] == 0)
+      for (unsigned long I = 0; I != Cache->Head().PackageCount; I++)
+        Show[I] = ToShow;
+   else
+      for (unsigned long I = 0; I != Cache->Head().PackageCount; I++)
+        Show[I] = None;
+   memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount);
+   
+   // Map the shapes
+   for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; ++Pkg)
+   {   
+      if (Pkg->VersionList == 0)

       {
       {

-        _error->Warning(_("Unable to locate package %s"),*I);
-        continue;
+        // Missing
+        if (Pkg->ProvidesList == 0)
+           ShapeMap[Pkg->ID] = 0;
+        else
+           ShapeMap[Pkg->ID] = 1;
+      }
+      else
+      {
+        // Normal
+        if (Pkg->ProvidesList == 0)
+           ShapeMap[Pkg->ID] = 2;
+        else
+           ShapeMap[Pkg->ID] = 3;

       }
       }

-      Colours[Pkg->ID] = 1;

    }
    }

-   
-   bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false);
-   bool DidSomething;
-   do
+
+   // Load the list of packages from the command line into the show list
+   APT::CacheSetHelper helper(true, GlobalError::NOTICE);
+   std::list<APT::CacheSetHelper::PkgModifier> mods;
+   mods.push_back(APT::CacheSetHelper::PkgModifier(0, ",", APT::PackageSet::Modifier::POSTFIX));
+   mods.push_back(APT::CacheSetHelper::PkgModifier(1, "^", APT::PackageSet::Modifier::POSTFIX));
+   std::map<unsigned short, APT::PackageSet> pkgsets =
+               APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0, helper);
+
+   for (APT::PackageSet::const_iterator Pkg = pkgsets[0].begin();
+       Pkg != pkgsets[0].end(); ++Pkg)
+      Show[Pkg->ID] = ToShow;
+   for (APT::PackageSet::const_iterator Pkg = pkgsets[1].begin();
+       Pkg != pkgsets[1].end(); ++Pkg)

    {
    {

-      DidSomething = false;
-      for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++)
+      Show[Pkg->ID] = ToShow;
+      Flags[Pkg->ID] |= ForceNR;
+   }
+
+   // Little header
+   cout << "graph: { title: \"packages\"" << endl <<
+     "xmax: 700 ymax: 700 x: 30 y: 30" << endl <<
+     "layout_downfactor: 8" << endl;
+
+   bool Act = true;
+   while (Act == true)
+   {
+      Act = false;
+      for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; ++Pkg)

       {
       {

-        if (Colours[Pkg->ID] != 1)
+        // See we need to show this package
+        if (Show[Pkg->ID] == None || Show[Pkg->ID] >= DoneNR)

            continue;
            continue;

-        Colours[Pkg->ID] = 2;
-        DidSomething = true;
+
+        //printf ("node: { title: \"%s\" label: \"%s\" }\n", Pkg.Name(), Pkg.Name());

         
         

-        pkgCache::VerIterator Ver = Pkg.VersionList();
-        if (Ver.end() == true)
+        // Colour as done
+        if (Show[Pkg->ID] == ToShowNR || (Flags[Pkg->ID] & ForceNR) == ForceNR)

         {
         {

-           cout << '<' << Pkg.Name() << '>' << endl;
+           // Pure Provides and missing packages have no deps!
+           if (ShapeMap[Pkg->ID] == 0 || ShapeMap[Pkg->ID] == 1)
+              Show[Pkg->ID] = Done;
+           else
+              Show[Pkg->ID] = DoneNR;
+        }       
+        else
+           Show[Pkg->ID] = Done;
+        Act = true;
+
+        // No deps to map out
+        if (Pkg->VersionList == 0 || Show[Pkg->ID] == DoneNR)

            continue;
            continue;

-        }

         
         

-        cout << Pkg.Name() << endl;
-        
-        for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
+        pkgCache::VerIterator Ver = Pkg.VersionList();
+        for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; ++D)

         {
         {

-           if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or)
-              cout << " |";
-           else
-              cout << "  ";
-           
-           // Show the package
-           pkgCache::PkgIterator Trg = D.TargetPkg();
-           if (Trg->VersionList == 0)
-              cout << D.DepType() << ": <" << Trg.Name() << ">" << endl;
-           else
-              cout << D.DepType() << ": " << Trg.Name() << endl;
+           // See if anything can meet this dep
+           // Walk along the actual package providing versions
+           bool Hit = false;
+           pkgCache::PkgIterator DPkg = D.TargetPkg();
+           for (pkgCache::VerIterator I = DPkg.VersionList();
+                     I.end() == false && Hit == false; ++I)
+           {
+              if (Cache->VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true)
+                 Hit = true;
+           }

            
            

-           if (Recurse == true)
-              Colours[D.TargetPkg()->ID]++;
+           // Follow all provides
+           for (pkgCache::PrvIterator I = DPkg.ProvidesList(); 
+                     I.end() == false && Hit == false; ++I)
+           {
+              if (Cache->VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false)
+                 Hit = true;
+           }

            
            

-           // Display all solutions
-           SPtrArray<pkgCache::Version *> List = D.AllTargets();
-           pkgPrioSortList(Cache,List);
-           for (pkgCache::Version **I = List; *I != 0; I++)
+
+           // Only graph critical deps     
+           if (D.IsCritical() == true)

            {
            {

-              pkgCache::VerIterator V(Cache,*I);
-              if (V != Cache.VerP + V.ParentPkg()->VersionList ||
-                  V->ParentPkg == D->Package)
-                 continue;
-              cout << "    " << V.ParentPkg().Name() << endl;
+              printf ("edge: { sourcename: \"%s\" targetname: \"%s\" class: 2 ",Pkg.FullName(true).c_str(), D.TargetPkg().FullName(true).c_str() );

               
               

-              if (Recurse == true)
-                 Colours[D.ParentPkg()->ID]++;
-           }
+              // Colour the node for recursion
+              if (Show[D.TargetPkg()->ID] <= DoneNR)
+              {
+                 /* If a conflicts does not meet anything in the database
+                    then show the relation but do not recurse */
+                 if (Hit == false && D.IsNegative() == true)
+                 {
+                    if (Show[D.TargetPkg()->ID] == None && 
+                        Show[D.TargetPkg()->ID] != ToShow)
+                       Show[D.TargetPkg()->ID] = ToShowNR;
+                 }               
+                 else
+                 {
+                    if (GivenOnly == true && Show[D.TargetPkg()->ID] != ToShow)
+                       Show[D.TargetPkg()->ID] = ToShowNR;
+                    else
+                       Show[D.TargetPkg()->ID] = ToShow;
+                 }
+              }
+              
+              // Edge colour
+              switch(D->Type)
+              {
+                 case pkgCache::Dep::Conflicts:
+                   printf("label: \"conflicts\" color: lightgreen }\n");
+                   break;
+                 case pkgCache::Dep::DpkgBreaks:
+                   printf("label: \"breaks\" color: lightgreen }\n");
+                   break;
+                 case pkgCache::Dep::Obsoletes:
+                   printf("label: \"obsoletes\" color: lightgreen }\n");
+                   break;
+                 
+                 case pkgCache::Dep::PreDepends:
+                   printf("label: \"predepends\" color: blue }\n");
+                   break;
+                 
+                 default:
+                   printf("}\n");
+                 break;
+              }               
+           }       

         }
         }

-      }      
+      }

    }   
    }   

-   while (DidSomething == true);

    
    

+   /* Draw the box colours after the fact since we can not tell what colour
+      they should be until everything is finished drawing */
+   for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; ++Pkg)
+   {
+      if (Show[Pkg->ID] < DoneNR)
+        continue;
+
+      if (Show[Pkg->ID] == DoneNR)
+        printf("node: { title: \"%s\" label: \"%s\" color: orange shape: %s }\n", Pkg.FullName(true).c_str(), Pkg.FullName(true).c_str(),
+               Shapes[ShapeMap[Pkg->ID]]);
+      else
+       printf("node: { title: \"%s\" label: \"%s\" shape: %s }\n", Pkg.FullName(true).c_str(), Pkg.FullName(true).c_str(),
+               Shapes[ShapeMap[Pkg->ID]]);
+      
+   }
+
+   delete[] Show;
+   delete[] Flags;
+   delete[] ShapeMap;
+
+   printf("}\n");

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


@@ -590,9 +754,13 @@ bool Depends(CommandLine &CmdL)
 /* Dotty is the graphvis program for generating graphs. It is a fairly
    simple queuing algorithm that just writes dependencies and nodes. 
    http://www.research.att.com/sw/tools/graphviz/ */
 /* Dotty is the graphvis program for generating graphs. It is a fairly
    simple queuing algorithm that just writes dependencies and nodes. 
    http://www.research.att.com/sw/tools/graphviz/ */

-bool Dotty(CommandLine &CmdL)
+static bool Dotty(CommandLine &CmdL)

 {
 {

-   pkgCache &Cache = *GCache;
+   pkgCacheFile CacheFile;
+   pkgCache *Cache = CacheFile.GetPkgCache();
+   if (unlikely(Cache == NULL))
+      return false;
+

    bool GivenOnly = _config->FindB("APT::Cache::GivenOnly",false);
    
    /* Normal packages are boxes
    bool GivenOnly = _config->FindB("APT::Cache::GivenOnly",false);
    
    /* Normal packages are boxes


@@ -609,21 +777,21 @@ bool Dotty(CommandLine &CmdL)
       0 = None */
    enum States {None=0, ToShow, ToShowNR, DoneNR, Done};
    enum TheFlags {ForceNR=(1<<0)};
       0 = None */
    enum States {None=0, ToShow, ToShowNR, DoneNR, Done};
    enum TheFlags {ForceNR=(1<<0)};

-   unsigned char *Show = new unsigned char[Cache.Head().PackageCount];
-   unsigned char *Flags = new unsigned char[Cache.Head().PackageCount];
-   unsigned char *ShapeMap = new unsigned char[Cache.Head().PackageCount];
+   unsigned char *Show = new unsigned char[Cache->Head().PackageCount];
+   unsigned char *Flags = new unsigned char[Cache->Head().PackageCount];
+   unsigned char *ShapeMap = new unsigned char[Cache->Head().PackageCount];

    
    // Show everything if no arguments given
    if (CmdL.FileList[1] == 0)
    
    // Show everything if no arguments given
    if (CmdL.FileList[1] == 0)

-      for (unsigned long I = 0; I != Cache.Head().PackageCount; I++)
+      for (unsigned long I = 0; I != Cache->Head().PackageCount; I++)

         Show[I] = ToShow;
    else
         Show[I] = ToShow;
    else

-      for (unsigned long I = 0; I != Cache.Head().PackageCount; I++)
+      for (unsigned long I = 0; I != Cache->Head().PackageCount; I++)

         Show[I] = None;
         Show[I] = None;

-   memset(Flags,0,sizeof(*Flags)*Cache.Head().PackageCount);
+   memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount);

    
    // Map the shapes
    
    // Map the shapes

-   for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++)
+   for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; ++Pkg)

    {   
       if (Pkg->VersionList == 0)
       {
    {   
       if (Pkg->VersionList == 0)
       {


@@ -642,38 +810,25 @@ bool Dotty(CommandLine &CmdL)
            ShapeMap[Pkg->ID] = 3;
       }
    }
            ShapeMap[Pkg->ID] = 3;
       }
    }

-   
+

    // Load the list of packages from the command line into the show list
    // Load the list of packages from the command line into the show list

-   for (const char **I = CmdL.FileList + 1; *I != 0; I++)
+   APT::CacheSetHelper helper(true, GlobalError::NOTICE);
+   std::list<APT::CacheSetHelper::PkgModifier> mods;
+   mods.push_back(APT::CacheSetHelper::PkgModifier(0, ",", APT::PackageSet::Modifier::POSTFIX));
+   mods.push_back(APT::CacheSetHelper::PkgModifier(1, "^", APT::PackageSet::Modifier::POSTFIX));
+   std::map<unsigned short, APT::PackageSet> pkgsets =
+               APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0, helper);
+
+   for (APT::PackageSet::const_iterator Pkg = pkgsets[0].begin();
+       Pkg != pkgsets[0].end(); ++Pkg)
+      Show[Pkg->ID] = ToShow;
+   for (APT::PackageSet::const_iterator Pkg = pkgsets[1].begin();
+       Pkg != pkgsets[1].end(); ++Pkg)

    {
    {

-      // Process per-package flags
-      string P = *I;
-      bool Force = false;
-      if (P.length() > 3)
-      {
-        if (P.end()[-1] == '^')
-        {
-           Force = true;
-           P.erase(P.end()-1);
-        }
-        
-        if (P.end()[-1] == ',')
-           P.erase(P.end()-1);
-      }
-      
-      // Locate the package
-      pkgCache::PkgIterator Pkg = Cache.FindPkg(P);
-      if (Pkg.end() == true)
-      {
-        _error->Warning(_("Unable to locate package %s"),*I);
-        continue;
-      }

       Show[Pkg->ID] = ToShow;
       Show[Pkg->ID] = ToShow;

-      
-      if (Force == true)
-        Flags[Pkg->ID] |= ForceNR;
+      Flags[Pkg->ID] |= ForceNR;

    }
    }

-   
+

    // Little header
    printf("digraph packages {\n");
    printf("concentrate=true;\n");
    // Little header
    printf("digraph packages {\n");
    printf("concentrate=true;\n");


@@ -683,7 +838,7 @@ bool Dotty(CommandLine &CmdL)
    while (Act == true)
    {
       Act = false;
    while (Act == true)
    {
       Act = false;

-      for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++)
+      for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; ++Pkg)

       {
         // See we need to show this package
         if (Show[Pkg->ID] == None || Show[Pkg->ID] >= DoneNR)
       {
         // See we need to show this package
         if (Show[Pkg->ID] == None || Show[Pkg->ID] >= DoneNR)


@@ -707,40 +862,38 @@ bool Dotty(CommandLine &CmdL)
            continue;
         
         pkgCache::VerIterator Ver = Pkg.VersionList();
            continue;
         
         pkgCache::VerIterator Ver = Pkg.VersionList();

-        for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
+        for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; ++D)

         {
            // See if anything can meet this dep
            // Walk along the actual package providing versions
            bool Hit = false;
            pkgCache::PkgIterator DPkg = D.TargetPkg();
            for (pkgCache::VerIterator I = DPkg.VersionList();
         {
            // See if anything can meet this dep
            // Walk along the actual package providing versions
            bool Hit = false;
            pkgCache::PkgIterator DPkg = D.TargetPkg();
            for (pkgCache::VerIterator I = DPkg.VersionList();

-                     I.end() == false && Hit == false; I++)
+                     I.end() == false && Hit == false; ++I)

            {
            {

-              if (Cache.VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true)
+              if (Cache->VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true)

                  Hit = true;
            }
            
            // Follow all provides
            for (pkgCache::PrvIterator I = DPkg.ProvidesList(); 
                  Hit = true;
            }
            
            // Follow all provides
            for (pkgCache::PrvIterator I = DPkg.ProvidesList(); 

-                     I.end() == false && Hit == false; I++)
+                     I.end() == false && Hit == false; ++I)

            {
            {

-              if (Cache.VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false)
+              if (Cache->VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false)

                  Hit = true;
            }
            
            // Only graph critical deps     
            if (D.IsCritical() == true)
            {
                  Hit = true;
            }
            
            // Only graph critical deps     
            if (D.IsCritical() == true)
            {

-              printf("\"%s\" -> \"%s\"",Pkg.Name(),D.TargetPkg().Name());
+              printf("\"%s\" -> \"%s\"",Pkg.FullName(true).c_str(),D.TargetPkg().FullName(true).c_str());

               
               // Colour the node for recursion
               if (Show[D.TargetPkg()->ID] <= DoneNR)
               {
                  /* If a conflicts does not meet anything in the database
                     then show the relation but do not recurse */
               
               // Colour the node for recursion
               if (Show[D.TargetPkg()->ID] <= DoneNR)
               {
                  /* If a conflicts does not meet anything in the database
                     then show the relation but do not recurse */

-                 if (Hit == false && 
-                     (D->Type == pkgCache::Dep::Conflicts ||
-                      D->Type == pkgCache::Dep::Obsoletes))
+                 if (Hit == false && D.IsNegative() == true)

                  {
                     if (Show[D.TargetPkg()->ID] == None && 
                         Show[D.TargetPkg()->ID] != ToShow)
                  {
                     if (Show[D.TargetPkg()->ID] == None && 
                         Show[D.TargetPkg()->ID] != ToShow)


@@ -760,6 +913,7 @@ bool Dotty(CommandLine &CmdL)
               {
                  case pkgCache::Dep::Conflicts:
                  case pkgCache::Dep::Obsoletes:
               {
                  case pkgCache::Dep::Conflicts:
                  case pkgCache::Dep::Obsoletes:

+                 case pkgCache::Dep::DpkgBreaks:

                  printf("[color=springgreen];\n");
                  break;
                  
                  printf("[color=springgreen];\n");
                  break;
                  


@@ -778,301 +932,71 @@ bool Dotty(CommandLine &CmdL)
    
    /* Draw the box colours after the fact since we can not tell what colour
       they should be until everything is finished drawing */
    
    /* Draw the box colours after the fact since we can not tell what colour
       they should be until everything is finished drawing */

-   for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++)
+   for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; ++Pkg)

    {
       if (Show[Pkg->ID] < DoneNR)
         continue;
       
       // Orange box for early recursion stoppage
       if (Show[Pkg->ID] == DoneNR)
    {
       if (Show[Pkg->ID] < DoneNR)
         continue;
       
       // Orange box for early recursion stoppage
       if (Show[Pkg->ID] == DoneNR)

-        printf("\"%s\" [color=orange,shape=%s];\n",Pkg.Name(),
+        printf("\"%s\" [color=orange,shape=%s];\n",Pkg.FullName(true).c_str(),

                Shapes[ShapeMap[Pkg->ID]]);
       else
                Shapes[ShapeMap[Pkg->ID]]);
       else

-        printf("\"%s\" [shape=%s];\n",Pkg.Name(),
+        printf("\"%s\" [shape=%s];\n",Pkg.FullName(true).c_str(),

                Shapes[ShapeMap[Pkg->ID]]);
    }
    
    printf("}\n");
                Shapes[ShapeMap[Pkg->ID]]);
    }
    
    printf("}\n");

+   delete[] Show;
+   delete[] Flags;
+   delete[] ShapeMap;

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

-// DoAdd - Perform an adding operation                                 /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool DoAdd(CommandLine &CmdL)
+/* ShowAuto - show automatically installed packages (sorted)           {{{*/
+static bool ShowAuto(CommandLine &)

 {
 {

-   return _error->Error("Unimplemented");
-#if 0   
-   // Make sure there is at least one argument
-   if (CmdL.FileSize() <= 1)
-      return _error->Error("You must give at least one file name");
-   
-   // Open the cache
-   FileFd CacheF(_config->FindFile("Dir::Cache::pkgcache"),FileFd::WriteAny);
-   if (_error->PendingError() == true)
-      return false;
-   
-   DynamicMMap Map(CacheF,MMap::Public);
-   if (_error->PendingError() == true)
+   pkgCacheFile CacheFile;
+   pkgCache *Cache = CacheFile.GetPkgCache();
+   pkgDepCache *DepCache = CacheFile.GetDepCache();
+   if (unlikely(Cache == NULL || DepCache == NULL))

       return false;
 
       return false;
 

-   OpTextProgress Progress(*_config);
-   pkgCacheGenerator Gen(Map,Progress);
-   if (_error->PendingError() == true)
-      return false;
-
-   unsigned long Length = CmdL.FileSize() - 1;
-   for (const char **I = CmdL.FileList + 1; *I != 0; I++)
-   {
-      Progress.OverallProgress(I - CmdL.FileList,Length,1,"Generating cache");
-      Progress.SubProgress(Length);
-
-      // Do the merge
-      FileFd TagF(*I,FileFd::ReadOnly);
-      debListParser Parser(TagF);
-      if (_error->PendingError() == true)
-        return _error->Error("Problem opening %s",*I);
-      
-      if (Gen.SelectFile(*I,"") == false)
-        return _error->Error("Problem with SelectFile");
-        
-      if (Gen.MergeList(Parser) == false)
-        return _error->Error("Problem with MergeList");
-   }
-
-   Progress.Done();
-   GCache = &Gen.GetCache();
-   Stats(CmdL);
-   
-   return true;
-#endif   
-}
-                                                                       /*}}}*/
-// DisplayRecord - Displays the complete record for the package                /*{{{*/
-// ---------------------------------------------------------------------
-/* This displays the package record from the proper package index file. 
-   It is not used by DumpAvail for performance reasons. */
-bool DisplayRecord(pkgCache::VerIterator V)
-{
-   // Find an appropriate file
-   pkgCache::VerFileIterator Vf = V.FileList();
-   for (; Vf.end() == false; Vf++)
-      if ((Vf.File()->Flags & pkgCache::Flag::NotSource) == 0)
-        break;
-   if (Vf.end() == true)
-      Vf = V.FileList();
-      
-   // Check and load the package list file
-   pkgCache::PkgFileIterator I = Vf.File();
-   if (I.IsOk() == false)
-      return _error->Error(_("Package file %s is out of sync."),I.FileName());
-   
-   FileFd PkgF(I.FileName(),FileFd::ReadOnly);
-   if (_error->PendingError() == true)
-      return false;
-   
-   // Read the record and then write it out again.
-   unsigned char *Buffer = new unsigned char[GCache->HeaderP->MaxVerFileSize+1];
-   Buffer[V.FileList()->Size] = '\n';
-   if (PkgF.Seek(V.FileList()->Offset) == false ||
-       PkgF.Read(Buffer,V.FileList()->Size) == false ||
-       write(STDOUT_FILENO,Buffer,V.FileList()->Size+1) != V.FileList()->Size+1)
-   {
-      delete [] Buffer;
-      return false;
-   }
-   
-   delete [] Buffer;
-
-   return true;
-}
-                                                                       /*}}}*/
-// Search - Perform a search                                           /*{{{*/
-// ---------------------------------------------------------------------
-/* This searches the package names and pacakge descriptions for a pattern */
-struct ExVerFile
-{
-   pkgCache::VerFile *Vf;
-   bool NameMatch;
-};
-
-bool Search(CommandLine &CmdL)
-{
-   pkgCache &Cache = *GCache;
-   bool ShowFull = _config->FindB("APT::Cache::ShowFull",false);
-   bool NamesOnly = _config->FindB("APT::Cache::NamesOnly",false);
-   unsigned NumPatterns = CmdL.FileSize() -1;
-   
-   pkgDepCache::Policy Plcy;
-   
-   // Make sure there is at least one argument
-   if (NumPatterns < 1)
-      return _error->Error(_("You must give exactly one pattern"));
-   
-   // Compile the regex pattern
-   regex_t *Patterns = new regex_t[NumPatterns];
-   memset(Patterns,0,sizeof(*Patterns)*NumPatterns);
-   for (unsigned I = 0; I != NumPatterns; I++)
-   {
-      if (regcomp(&Patterns[I],CmdL.FileList[I+1],REG_EXTENDED | REG_ICASE | 
-                 REG_NOSUB) != 0)
-      {
-        for (; I != 0; I--)
-           regfree(&Patterns[I]);
-        return _error->Error("Regex compilation error");
-      }      
-   }
+   std::vector<string> packages;
+   packages.reserve(Cache->HeaderP->PackageCount / 3);

    
    

-   // Create the text record parser
-   pkgRecords Recs(Cache);
-   if (_error->PendingError() == true)
-   {
-      for (unsigned I = 0; I != NumPatterns; I++)
-        regfree(&Patterns[I]);
-      return false;
-   }
-   
-   ExVerFile *VFList = new ExVerFile[Cache.HeaderP->PackageCount+1];
-   memset(VFList,0,sizeof(*VFList)*Cache.HeaderP->PackageCount+1);
-
-   // Map versions that we want to write out onto the VerList array.
-   for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
-   {
-      VFList[P->ID].NameMatch = NumPatterns != 0;
-      for (unsigned I = 0; I != NumPatterns; I++)
-      {
-        if (regexec(&Patterns[I],P.Name(),0,0,0) == 0)
-           VFList[P->ID].NameMatch &= true;
-        else
-           VFList[P->ID].NameMatch = false;
-      }
-        
-      // Doing names only, drop any that dont match..
-      if (NamesOnly == true && VFList[P->ID].NameMatch == false)
-        continue;
-        
-      // Find the proper version to use. 
-      pkgCache::VerIterator V = Plcy.GetCandidateVer(P);
-      if (V.end() == false)
-        VFList[P->ID].Vf = V.FileList();
-   }
-      
-   // Include all the packages that provide matching names too
-   for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
-   {
-      if (VFList[P->ID].NameMatch == false)
-        continue;
-
-      for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; Prv++)
-      {
-        pkgCache::VerIterator V = Plcy.GetCandidateVer(Prv.OwnerPkg());
-        if (V.end() == false)
-        {
-           VFList[Prv.OwnerPkg()->ID].Vf = V.FileList();
-           VFList[Prv.OwnerPkg()->ID].NameMatch = true;
-        }
-      }
-   }
-
-   LocalitySort(&VFList->Vf,Cache.HeaderP->PackageCount,sizeof(*VFList));
-
-   // Iterate over all the version records and check them
-   for (ExVerFile *J = VFList; J->Vf != 0; J++)
-   {
-      pkgRecords::Parser &P = Recs.Lookup(pkgCache::VerFileIterator(Cache,J->Vf));
+   for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; ++P)
+      if ((*DepCache)[P].Flags & pkgCache::Flag::Auto)
+         packages.push_back(P.Name());

 
 

-      bool Match = true;
-      if (J->NameMatch == false)
-      {
-        string LongDesc = P.LongDesc();
-        Match = NumPatterns != 0;
-        for (unsigned I = 0; I != NumPatterns; I++)
-        {
-           if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0)
-              Match &= true;
-           else
-              Match = false;
-        }
-      }
-      
-      if (Match == true)
-      {
-        if (ShowFull == true)
-        {
-           const char *Start;
-           const char *End;
-           P.GetRec(Start,End);
-           fwrite(Start,End-Start,1,stdout);
-           putc('\n',stdout);
-        }       
-        else
-           printf("%s - %s\n",P.Name().c_str(),P.ShortDesc().c_str());
-      }
-   }
-   
-   delete [] VFList;
-   for (unsigned I = 0; I != NumPatterns; I++)
-      regfree(&Patterns[I]);
-   if (ferror(stdout))
-       return _error->Error("Write to stdout failed");
-   return true;
-}
-                                                                       /*}}}*/
-// ShowPackage - Dump the package record to the screen                 /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool ShowPackage(CommandLine &CmdL)
-{   
-   pkgCache &Cache = *GCache;
-   pkgDepCache::Policy Plcy;
-   
-   for (const char **I = CmdL.FileList + 1; *I != 0; I++)
-   {
-      pkgCache::PkgIterator Pkg = Cache.FindPkg(*I);
-      if (Pkg.end() == true)
-      {
-        _error->Warning(_("Unable to locate package %s"),*I);
-        continue;
-      }
+    std::sort(packages.begin(), packages.end());
+    
+    for (vector<string>::iterator I = packages.begin(); I != packages.end(); ++I)
+            cout << *I << "\n";

 
 

-      // Find the proper version to use.
-      if (_config->FindB("APT::Cache::AllVersions","true") == true)
-      {
-        pkgCache::VerIterator V;
-        for (V = Pkg.VersionList(); V.end() == false; V++)
-        {
-           if (DisplayRecord(V) == false)
-              return false;
-        }
-      }
-      else
-      {
-        pkgCache::VerIterator V = Plcy.GetCandidateVer(Pkg);
-        if (V.end() == true || V.FileList().end() == true)
-           continue;
-        if (DisplayRecord(V) == false)
-           return false;
-      }      
-   }
+   _error->Notice(_("This command is deprecated. Please use 'apt-mark showauto' instead."));

    return true;
 }
                                                                        /*}}}*/
 // ShowPkgNames - Show package names                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* This does a prefix match on the first argument */
    return true;
 }
                                                                        /*}}}*/
 // ShowPkgNames - Show package names                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* This does a prefix match on the first argument */

-bool ShowPkgNames(CommandLine &CmdL)
+static bool ShowPkgNames(CommandLine &CmdL)

 {
 {

-   pkgCache &Cache = *GCache;
-   pkgCache::PkgIterator I = Cache.PkgBegin();
-   bool All = _config->FindB("APT::Cache::AllNames","false");
-   
+   pkgCacheFile CacheFile;
+   if (unlikely(CacheFile.BuildCaches(NULL, false) == false))
+      return false;
+   pkgCache::GrpIterator I = CacheFile.GetPkgCache()->GrpBegin();
+   bool const All = _config->FindB("APT::Cache::AllNames","false");
+

    if (CmdL.FileList[1] != 0)
    {
    if (CmdL.FileList[1] != 0)
    {

-      for (;I.end() != true; I++)
+      for (;I.end() != true; ++I)

       {
       {

-        if (All == false && I->VersionList == 0)
+        if (All == false && I->FirstPackage == 0)
+           continue;
+        if (I.FindPkg("any")->VersionList == 0)

            continue;
            continue;

-        

         if (strncmp(I.Name(),CmdL.FileList[1],strlen(CmdL.FileList[1])) == 0)
            cout << I.Name() << endl;
       }
         if (strncmp(I.Name(),CmdL.FileList[1],strlen(CmdL.FileList[1])) == 0)
            cout << I.Name() << endl;
       }


@@ -1081,9 +1005,11 @@ bool ShowPkgNames(CommandLine &CmdL)
    }
    
    // Show all pkgs
    }
    
    // Show all pkgs

-   for (;I.end() != true; I++)
+   for (;I.end() != true; ++I)

    {
    {

-      if (All == false && I->VersionList == 0)
+      if (All == false && I->FirstPackage == 0)
+        continue;
+      if (I.FindPkg("any")->VersionList == 0)

         continue;
       cout << I.Name() << endl;
    }
         continue;
       cout << I.Name() << endl;
    }


@@ -1091,311 +1017,142 @@ bool ShowPkgNames(CommandLine &CmdL)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-// ShowSrcPackage - Show source package records                                /*{{{*/
+// Madison - Look a bit like katie's madison                           /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-bool ShowSrcPackage(CommandLine &CmdL)
+static bool Madison(CommandLine &CmdL)

 {
 {

-   pkgSourceList List;
-   List.ReadMainList();
-   
-   // Create the text record parsers
-   pkgSrcRecords SrcRecs(List);
-   if (_error->PendingError() == true)
-      return false;
+   pkgCacheFile CacheFile;
+   pkgSourceList *SrcList = CacheFile.GetSourceList();

 
 

-   for (const char **I = CmdL.FileList + 1; *I != 0; I++)
-   {
-      SrcRecs.Restart();
-      
-      pkgSrcRecords::Parser *Parse;
-      while ((Parse = SrcRecs.Find(*I,false)) != 0)
-        cout << Parse->AsStr() << endl;;
-   }      
-   return true;
-}
-                                                                       /*}}}*/
-// Policy - Show the results of the preferences file                   /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool Policy(CommandLine &CmdL)
-{

    if (SrcList == 0)
    if (SrcList == 0)

-      return _error->Error("Generate must be enabled for this function");
-   
-   pkgCache &Cache = *GCache;
-   pkgPolicy Plcy(&Cache);
-   if (ReadPinFile(Plcy) == false)

       return false;
       return false;

-   
-   // Print out all of the package files
-   if (CmdL.FileList[1] == 0)
-   {
-      cout << _("Package Files:") << endl;   
-      for (pkgCache::PkgFileIterator F = Cache.FileBegin(); F.end() == false; F++)
-      {
-        // Locate the associated index files so we can derive a description
-        pkgIndexFile *Indx;
-        if (SrcList->FindIndex(F,Indx) == false &&
-            _system->FindIndex(F,Indx) == false)
-           return _error->Error(_("Cache is out of sync, can't x-ref a package file"));
-        printf(_("%4i %s\n"),
-               Plcy.GetPriority(F),Indx->Describe(true).c_str());
-        
-        // Print the reference information for the package
-        string Str = F.RelStr();
-        if (Str.empty() == false)
-           printf("     release %s\n",F.RelStr().c_str());
-        if (F.Site() != 0 && F.Site()[0] != 0)
-           printf("     origin %s\n",F.Site());
-      }
-      
-      // Show any packages have explicit pins
-      cout << _("Pinned Packages:") << endl;
-      pkgCache::PkgIterator I = Cache.PkgBegin();
-      for (;I.end() != true; I++)
-      {
-        if (Plcy.GetPriority(I) == 0)
-           continue;

 
 

-        // Print the package name and the version we are forcing to
-        cout << "     " << I.Name() << " -> ";
-        
-        pkgCache::VerIterator V = Plcy.GetMatch(I);
-        if (V.end() == true)
-           cout << _("(not found)") << endl;
-        else
-           cout << V.VerStr() << endl;
-      }     
-      
-      return true;
-   }
-   
-   // Print out detailed information for each package
+   // Create the src text record parsers and ignore errors about missing
+   // deb-src lines that are generated from pkgSrcRecords::pkgSrcRecords
+   pkgSrcRecords SrcRecs(*SrcList);
+   if (_error->PendingError() == true)
+      _error->Discard();
+
+   APT::CacheSetHelper helper(true, GlobalError::NOTICE);

    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {

-      pkgCache::PkgIterator Pkg = Cache.FindPkg(*I);
-      if (Pkg.end() == true)
+      _error->PushToStack();
+      APT::PackageList pkgset = APT::PackageList::FromString(CacheFile, *I, helper);
+      for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)

       {
       {

-        _error->Warning(_("Unable to locate package %s"),*I);
-        continue;
+         for (pkgCache::VerIterator V = Pkg.VersionList(); V.end() == false; ++V)
+         {
+            for (pkgCache::VerFileIterator VF = V.FileList(); VF.end() == false; ++VF)
+            {
+// This might be nice, but wouldn't uniquely identify the source -mdz
+//                if (VF.File().Archive() != 0)
+//                {
+//                   cout << setw(10) << Pkg.Name() << " | " << setw(10) << V.VerStr() << " | "
+//                        << VF.File().Archive() << endl;
+//                }
+
+               // Locate the associated index files so we can derive a description
+               for (pkgSourceList::const_iterator S = SrcList->begin(); S != SrcList->end(); ++S)
+               {
+                    vector<pkgIndexFile *> *Indexes = (*S)->GetIndexFiles();
+                    for (vector<pkgIndexFile *>::const_iterator IF = Indexes->begin();
+                         IF != Indexes->end(); ++IF)
+                    {
+                         if ((*IF)->FindInCache(*(VF.File().Cache())) == VF.File())
+                         {
+                                   cout << setw(10) << Pkg.FullName(true) << " | " << setw(10) << V.VerStr() << " | "
+                                        << (*IF)->Describe(true) << endl;
+                         }
+                    }
+               }
+            }
+         }

       }
       }

-      
-      cout << Pkg.Name() << ":" << endl;
-      
-      // Installed version
-      cout << _("  Installed: ");
-      if (Pkg->CurrentVer == 0)
-        cout << _("(none)") << endl;
-      else
-        cout << Pkg.CurrentVer().VerStr() << endl;
-      
-      // Candidate Version 
-      cout << _("  Candidate: ");
-      pkgCache::VerIterator V = Plcy.GetCandidateVer(Pkg);
-      if (V.end() == true)
-        cout << _("(none)") << endl;
-      else
-        cout << V.VerStr() << endl;

 
 

-      // Pinned version
-      if (Plcy.GetPriority(Pkg) != 0)
+      SrcRecs.Restart();
+      pkgSrcRecords::Parser *SrcParser;
+      bool foundSomething = false;
+      while ((SrcParser = SrcRecs.Find(*I, false)) != 0)

       {
       {

-        cout << _("  Package Pin: ");
-        V = Plcy.GetMatch(Pkg);
-        if (V.end() == true)
-           cout << _("(not found)") << endl;
-        else
-           cout << V.VerStr() << endl;
+         foundSomething = true;
+         // Maybe support Release info here too eventually
+         cout << setw(10) << SrcParser->Package() << " | "
+              << setw(10) << SrcParser->Version() << " | "
+              << SrcParser->Index().Describe(true) << endl;

       }
       }

-      
-      // Show the priority tables
-      cout << _("  Version Table:") << endl;
-      for (V = Pkg.VersionList(); V.end() == false; V++)
-      {
-        if (Pkg.CurrentVer() == V)
-           cout << " *** " << V.VerStr();
-        else
-           cout << "     " << V.VerStr();
-        cout << " " << Plcy.GetPriority(Pkg) << endl;
-        for (pkgCache::VerFileIterator VF = V.FileList(); VF.end() == false; VF++)
-        {
-           // Locate the associated index files so we can derive a description
-           pkgIndexFile *Indx;
-           if (SrcList->FindIndex(VF.File(),Indx) == false &&
-               _system->FindIndex(VF.File(),Indx) == false)
-              return _error->Error(_("Cache is out of sync, can't x-ref a package file"));
-           printf(_("       %4i %s\n"),Plcy.GetPriority(VF.File()),
-                  Indx->Describe(true).c_str());
-        }       
-      }      
+      if (foundSomething == true)
+        _error->RevertToStack();
+      else
+        _error->MergeWithStack();

    }
    }

-   
+

    return true;
 }
                                                                        /*}}}*/
 // GenCaches - Call the main cache generator                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */
    return true;
 }
                                                                        /*}}}*/
 // GenCaches - Call the main cache generator                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool GenCaches(CommandLine &Cmd)
+static bool GenCaches(CommandLine &)

 {
    OpTextProgress Progress(*_config);
 {
    OpTextProgress Progress(*_config);

-   
-   pkgSourceList List;
-   if (List.ReadMainList() == false)
-      return false;   
-   return pkgMakeStatusCache(List,Progress);
+
+   pkgCacheFile CacheFile;
+   return CacheFile.BuildCaches(&Progress, true);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-// ShowHelp - Show a help screen                                       /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool ShowHelp(CommandLine &Cmd)
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
 {

-   ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
-   
-   cout << 
+   std::cout <<

     _("Usage: apt-cache [options] command\n"
     _("Usage: apt-cache [options] command\n"

-      "       apt-cache [options] add file1 [file1 ...]\n"
-      "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+      "       apt-cache [options] show pkg1 [pkg2 ...]\n"

       "\n"
       "\n"

-      "apt-cache is a low-level tool used to manipulate APT's binary\n"
-      "cache files, and query information from them\n"
-      "\n"
-      "Commands:\n"
-      "   add - Add an package file to the source cache\n"
-      "   gencaches - Build both the package and source cache\n"
-      "   showpkg - Show some general information for a single package\n"
-      "   stats - Show some basic statistics\n"
-      "   dump - Show the entire file in a terse form\n"
-      "   dumpavail - Print an available file to stdout\n"
-      "   unmet - Show unmet dependencies\n"
-      "   search - Search the package list for a regex pattern\n"
-      "   show - Show a readable record for the package\n"
-      "   depends - Show raw dependency information for a package\n"
-      "   pkgnames - List the names of all packages\n"
-      "   dotty - Generate package graphs for GraphVis\n"
-      "   policy - Show policy settings\n"
-      "\n"
-      "Options:\n"
-      "  -h   This help text.\n"
-      "  -p=? The package cache.\n"
-      "  -s=? The source cache.\n"
-      "  -q   Disable progress indicator.\n"
-      "  -i   Show only important deps for the unmet command.\n"
-      "  -c=? Read this configuration file\n"
-      "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
-      "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n");
+      "apt-cache queries and displays available information about installed\n"
+      "and installable packages. It works exclusively on the data acquired\n"
+      "into the local cache via the 'update' command of e.g. apt-get. The\n"
+      "displayed information may therefore be outdated if the last update was\n"
+      "too long ago, but in exchange apt-cache works independently of the\n"
+      "availability of the configured sources (e.g. offline).\n");

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

-// CacheInitialize - Initialize things for apt-cache                   /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void CacheInitialize()
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
 {

-   _config->Set("quiet",0);
-   _config->Set("help",false);
+   return {
+      {"gencaches",&GenCaches, nullptr},
+      {"showsrc",&ShowSrcPackage, _("Show source records")},
+      {"showpkg",&DumpPackage, nullptr},
+      {"stats",&Stats, nullptr},
+      {"dump",&Dump, nullptr},
+      {"dumpavail",&DumpAvail, nullptr},
+      {"unmet",&UnMet, nullptr},
+      {"search",&DoSearch, _("Search the package list for a regex pattern")},
+      {"depends",&Depends, _("Show raw dependency information for a package")},
+      {"rdepends",&RDepends, _("Show reverse dependency information for a package")},
+      {"dotty",&Dotty, nullptr},
+      {"xvcg",&XVcg, nullptr},
+      {"show",&ShowPackage, _("Show a readable record for the package")},
+      {"pkgnames",&ShowPkgNames, _("List the names of all packages in the system")},
+      {"showauto",&ShowAuto, nullptr},
+      {"policy",&Policy, _("Show policy settings")},
+      {"madison",&Madison, nullptr},
+      {nullptr, nullptr, nullptr}
+   };

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-
-int main(int argc,const char *argv[])
+int main(int argc,const char *argv[])                                  /*{{{*/

 {
 {

-   CommandLine::Args Args[] = {
-      {'h',"help","help",0},
-      {'v',"version","version",0},
-      {'p',"pkg-cache","Dir::Cache::pkgcache",CommandLine::HasArg},
-      {'s',"src-cache","Dir::Cache::srcpkgcache",CommandLine::HasArg},
-      {'q',"quiet","quiet",CommandLine::IntLevel},
-      {'i',"important","APT::Cache::Important",0},
-      {'f',"full","APT::Cache::ShowFull",0},
-      {'g',"generate","APT::Cache::Generate",0},
-      {'a',"all-versions","APT::Cache::AllVersions",0},
-      {0,"names-only","APT::Cache::NamesOnly",0},
-      {0,"all-names","APT::Cache::AllNames",0},
-      {0,"recurse","APT::Cache::RecurseDepends",0},
-      {'c',"config-file",0,CommandLine::ConfigFile},
-      {'o',"option",0,CommandLine::ArbItem},
-      {0,0,0,0}};
-   CommandLine::Dispatch CmdsA[] = {{"help",&ShowHelp},
-                                    {"add",&DoAdd},
-                                    {"gencaches",&GenCaches},
-                                    {"showsrc",&ShowSrcPackage},
-                                    {0,0}};
-   CommandLine::Dispatch CmdsB[] = {{"showpkg",&DumpPackage},
-                                    {"stats",&Stats},
-                                    {"dump",&Dump},
-                                    {"dumpavail",&DumpAvail},
-                                    {"unmet",&UnMet},
-                                    {"search",&Search},
-                                    {"depends",&Depends},
-                                    {"dotty",&Dotty},
-                                    {"show",&ShowPackage},
-                                    {"pkgnames",&ShowPkgNames},
-                                    {"policy",&Policy},
-                                    {0,0}};
-
-   CacheInitialize();
-   
+   InitLocale();
+

    // Parse the command line and initialize the package library
    // Parse the command line and initialize the package library

-   CommandLine CmdL(Args,_config);
-   if (pkgInitConfig(*_config) == false ||
-       CmdL.Parse(argc,argv) == false ||
-       pkgInitSystem(*_config,_system) == false)
-   {
-      _error->DumpErrors();
-      return 100;
-   }
+   CommandLine CmdL;
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CACHE, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);

 
 

-   // See if the help should be shown
-   if (_config->FindB("help") == true ||
-       CmdL.FileSize() == 0)
-   {
-      ShowHelp(CmdL);
-      return 0;
-   }
-   
-   // Deal with stdout not being a tty
-   if (ttyname(STDOUT_FILENO) == 0 && _config->FindI("quiet",0) < 1)
-      _config->Set("quiet","1");
-
-   if (CmdL.DispatchArg(CmdsA,false) == false && _error->PendingError() == false)
-   { 
-      MMap *Map;
-      if (_config->FindB("APT::Cache::Generate",true) == false)
-      {
-        Map = new MMap(*new FileFd(_config->FindFile("Dir::Cache::pkgcache"),
-                                   FileFd::ReadOnly),MMap::Public|MMap::ReadOnly);
-      }
-      else
-      {
-        // Open the cache file
-        SrcList = new pkgSourceList;
-        SrcList->ReadMainList();
+   InitOutput();

 
 

-        // Generate it and map it
-        OpProgress Prog;
-        pkgMakeStatusCache(*SrcList,Prog,&Map,true);
-      }
-      
-      if (_error->PendingError() == false)
-      {
-        pkgCache Cache(Map);   
-        GCache = &Cache;
-        if (_error->PendingError() == false)
-           CmdL.DispatchArg(CmdsB);
-      }
-      delete Map;
-   }
-   
-   // Print any errors or warnings found during parsing
-   if (_error->empty() == false)
-   {
-      bool Errors = _error->PendingError();
-      _error->DumpErrors();
-      return Errors == true?100:0;
-   }
-          
-   return 0;
+   if (_config->Exists("APT::Cache::Generate") == true)
+      _config->Set("pkgCacheFile::Generate", _config->FindB("APT::Cache::Generate", true));
+
+   return DispatchCommandLine(CmdL, Cmds);

 }
 }

+                                                                       /*}}}*/