Document the general effect of the comma operator

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

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 6813d297865ac4f4323491e19b46cf5949ede678..a0322498652954073f2ba4cc410af21c879ecdaf 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -13,66 +13,61 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#include <apt-pkg/error.h>
-#include <cassert>
-#include <apt-pkg/pkgcachegen.h>
+#include<config.h>
+
+#include <apt-pkg/algorithms.h>

 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cacheset.h>

+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/error.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 <locale.h>
-#include <iostream>
-#include <unistd.h>
-#include <errno.h>

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

+#include <stddef.h>

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

-
+#include <stdlib.h>
+#include <unistd.h>
+#include <algorithm>
+#include <cstring>

 #include <iomanip>
 #include <iomanip>

+#include <iostream>
+#include <list>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 using namespace std;
 
                                                                        /*}}}*/
 
 using namespace std;
 

-// CacheSetHelper saving virtual packages                              /*{{{*/
-class CacheSetHelperVirtuals: public APT::CacheSetHelper {
-public:
-   APT::PackageSet virtualPkgs;
-
-   virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) {
-      virtualPkgs.insert(Pkg);
-      return CacheSetHelper::canNotFindCandidateVer(Cache, Pkg);
-   }
-
-   virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) {
-      virtualPkgs.insert(Pkg);
-      return CacheSetHelper::canNotFindNewestVer(Cache, Pkg);
-   }
-
-   virtual APT::VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) {
-      virtualPkgs.insert(Pkg);
-      return CacheSetHelper::canNotFindAllVer(Cache, Pkg);
-   }
-
-   CacheSetHelperVirtuals(bool const &ShowErrors = true, GlobalError::MsgType const &ErrorType = GlobalError::NOTICE) : CacheSetHelper(ShowErrors, ErrorType) {}
-};
-                                                                       /*}}}*/

 // LocalitySort - Sort a version list by package file locality         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // LocalitySort - Sort a version list by package file locality         /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-int LocalityCompare(const void *a, const void *b)
+static int LocalityCompare(const void *a, const void *b)

 {
    pkgCache::VerFile *A = *(pkgCache::VerFile **)a;
    pkgCache::VerFile *B = *(pkgCache::VerFile **)b;
 {
    pkgCache::VerFile *A = *(pkgCache::VerFile **)a;
    pkgCache::VerFile *B = *(pkgCache::VerFile **)b;


@@ -89,13 +84,13 @@ int LocalityCompare(const void *a, const void *b)
    return A->File - B->File;
 }
 
    return A->File - B->File;
 }
 

-void LocalitySort(pkgCache::VerFile **begin,
+static void LocalitySort(pkgCache::VerFile **begin,

                  unsigned long Count,size_t Size)
 {   
    qsort(begin,Count,Size,LocalityCompare);
 }
 
                  unsigned long Count,size_t Size)
 {   
    qsort(begin,Count,Size,LocalityCompare);
 }
 

-void LocalitySort(pkgCache::DescFile **begin,
+static void LocalitySort(pkgCache::DescFile **begin,

                  unsigned long Count,size_t Size)
 {   
    qsort(begin,Count,Size,LocalityCompare);
                  unsigned long Count,size_t Size)
 {   
    qsort(begin,Count,Size,LocalityCompare);


@@ -104,7 +99,7 @@ void LocalitySort(pkgCache::DescFile **begin,
 // UnMet - Show unmet dependencies                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // UnMet - Show unmet dependencies                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool ShowUnMet(pkgCache::VerIterator const &V, bool const &Important)
+static bool ShowUnMet(pkgCache::VerIterator const &V, bool const Important)

 {
         bool Header = false;
         for (pkgCache::DepIterator D = V.DependsList(); D.end() == false;)
 {
         bool Header = false;
         for (pkgCache::DepIterator D = V.DependsList(); D.end() == false;)


@@ -121,9 +116,7 @@ bool ShowUnMet(pkgCache::VerIterator const &V, bool const &Important)
                  continue;
 
            // Skip conflicts and replaces
                  continue;
 
            // Skip conflicts and replaces

-           if (End->Type == pkgCache::Dep::DpkgBreaks ||
-               End->Type == pkgCache::Dep::Replaces ||
-               End->Type == pkgCache::Dep::Conflicts)
+           if (End.IsNegative() == true || End->Type == pkgCache::Dep::Replaces)

               continue;
 
            // Verify the or group
               continue;
 
            // Verify the or group


@@ -140,10 +133,10 @@ bool ShowUnMet(pkgCache::VerIterator const &V, bool const &Important)
                  break;
               }
               delete [] VList;
                  break;
               }
               delete [] VList;

-              
+

               if (Start == End)
                  break;
               if (Start == End)
                  break;

-              Start++;
+              ++Start;

            }
            while (1);
 
            }
            while (1);
 


@@ -171,7 +164,7 @@ bool ShowUnMet(pkgCache::VerIterator const &V, bool const &Important)
               if (Start == End)
                  break;
               cout << " | ";
               if (Start == End)
                  break;
               cout << " | ";

-              Start++;
+              ++Start;

            }
            while (1);
            
            }
            while (1);
            


@@ -179,7 +172,7 @@ bool ShowUnMet(pkgCache::VerIterator const &V, bool const &Important)
         }
    return true;
 }
         }
    return true;
 }

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

 {
    bool const Important = _config->FindB("APT::Cache::Important",false);
 
 {
    bool const Important = _config->FindB("APT::Cache::Important",false);
 


@@ -189,7 +182,7 @@ bool UnMet(CommandLine &CmdL)
 
    if (CmdL.FileSize() <= 1)
    {
 
    if (CmdL.FileSize() <= 1)
    {

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

         for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; ++V)
            if (ShowUnMet(V, Important) == false)
               return false;
         for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; ++V)
            if (ShowUnMet(V, Important) == false)
               return false;


@@ -197,9 +190,9 @@ bool UnMet(CommandLine &CmdL)
    else
    {
       CacheSetHelperVirtuals helper(true, GlobalError::NOTICE);
    else
    {
       CacheSetHelperVirtuals helper(true, GlobalError::NOTICE);

-      APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1,
-                               APT::VersionSet::CANDIDATE, helper);
-      for (APT::VersionSet::iterator V = verset.begin(); V != verset.end(); ++V)
+      APT::VersionList verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1,
+                               APT::CacheSetHelper::CANDIDATE, helper);
+      for (APT::VersionList::iterator V = verset.begin(); V != verset.end(); ++V)

         if (ShowUnMet(V, Important) == false)
            return false;
    }
         if (ShowUnMet(V, Important) == false)
            return false;
    }


@@ -209,23 +202,23 @@ bool UnMet(CommandLine &CmdL)
 // DumpPackage - Show a dump of a package record                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // DumpPackage - Show a dump of a package record                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
    pkgCacheFile CacheFile;
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);
 {
    pkgCacheFile CacheFile;
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);

-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper);
+   APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1, helper);

 
 

-   for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+   for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)

    {
       cout << "Package: " << Pkg.FullName(true) << endl;
       cout << "Versions: " << endl;
    {
       cout << "Package: " << Pkg.FullName(true) << 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++)
+        for (pkgCache::VerFileIterator Vf = Cur.FileList(); Vf.end() == false; ++Vf)

            cout << " (" << Vf.File().FileName() << ")";
         cout << endl;
            cout << " (" << Vf.File().FileName() << ")";
         cout << endl;

-        for (pkgCache::DescIterator D = Cur.DescriptionList(); D.end() == false; D++)
+        for (pkgCache::DescIterator D = Cur.DescriptionList(); D.end() == false; ++D)

         {
            cout << " Description Language: " << D.LanguageCode() << endl
                 << "                 File: " << D.FileList().File().FileName() << endl
         {
            cout << " Description Language: " << D.LanguageCode() << endl
                 << "                 File: " << D.FileList().File().FileName() << endl


@@ -237,7 +230,7 @@ bool DumpPackage(CommandLine &CmdL)
       cout << endl;
       
       cout << "Reverse Depends: " << 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().FullName(true) << ',' << D.TargetPkg().FullName(true);
         if (D->Version != 0)
       {
         cout << "  " << D.ParentPkg().FullName(true) << ',' << D.TargetPkg().FullName(true);
         if (D->Version != 0)


@@ -247,37 +240,85 @@ 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++)
+        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 << Dep.TargetPkg().FullName(true) << " (" << (int)Dep->CompareOp << " " << DeNull(Dep.TargetVer()) << ") ";
         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().FullName(true) << " ";
+        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().FullName(true) << " " << 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 << "  Average entries: " << Entries/(double)NumBuckets << 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)

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();

+
+   if (CmdL.FileSize() > 1) {
+      _error->Error(_("apt-cache stats does not take any arguments"));
+      return false;
+   }

    if (unlikely(Cache == NULL))
       return false;
 
    if (unlikely(Cache == NULL))
       return false;
 


@@ -292,7 +333,7 @@ bool Stats(CommandLine &Cmd)
    int DVirt = 0;
    int Missing = 0;
    pkgCache::PkgIterator I = Cache->PkgBegin();
    int DVirt = 0;
    int Missing = 0;
    pkgCache::PkgIterator I = Cache->PkgBegin();

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

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


@@ -328,108 +369,153 @@ bool Stats(CommandLine &Cmd)
    cout << _("  Single virtual packages: ") << DVirt << endl;
    cout << _("  Mixed virtual packages: ") << NVirt << endl;
    cout << _("  Missing: ") << Missing << endl;
    cout << _("  Single virtual packages: ") << DVirt << endl;
    cout << _("  Mixed virtual packages: ") << NVirt << endl;
    cout << _("  Missing: ") << Missing << endl;

-   
+

    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 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 << " (" << 
-      SizeToStr(Cache->Head().DependsCount*Cache->Head().DependencySz) << ')' << 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;
    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
-   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++)
+   // 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++)
       Slack += Cache->Head().Pools[I].ItemSize*Cache->Head().Pools[I].Count;
    cout << _("Total slack space: ") << SizeToStr(Slack) << endl;
    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;

-   
+

    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;
+#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;
    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 &)

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
    if (unlikely(Cache == NULL))
       return false;
 
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
    if (unlikely(Cache == NULL))
       return false;
 

-   cout << "Using Versioning System: " << Cache->VS->Label << endl;
+   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.FullName(true) << 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().FullName(true) << ' ' << 
-                            DeNull(D.TargetVer()) << endl;
-        for (pkgCache::DescIterator D = V.DescriptionList(); D.end() == false; D++)
+        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)

         {
         {

-           cout << " Description Language: " << D.LanguageCode() << endl
-                << "                 File: " << D.FileList().File().FileName() << endl
-                << "                  MD5: " << D.md5() << endl;
+           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;


@@ -439,7 +525,7 @@ 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 &)

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();


@@ -451,7 +537,7 @@ bool DumpAvail(CommandLine &Cmd)
    memset(VFList,0,sizeof(*VFList)*Count);
    
    // Map versions that we want to write out onto the VerList array.
    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;


@@ -468,7 +554,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;
       


@@ -482,9 +568,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)
               {


@@ -503,6 +589,12 @@ 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.
    char *Buffer = new char[Cache->HeaderP->MaxVerFileSize+10];
    for (pkgCache::VerFile **J = VFList; *J != 0;)
    // Iterate over all the package files and write them out.
    char *Buffer = new char[Cache->HeaderP->MaxVerFileSize+10];
    for (pkgCache::VerFile **J = VFList; *J != 0;)


@@ -514,7 +606,7 @@ bool DumpAvail(CommandLine &Cmd)
         break;
       }
 
         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;
       


@@ -543,42 +635,39 @@ 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();
 }
                                                                        /*}}}*/
 // ShowDepends - Helper for printing out a dependency tree             /*{{{*/
    delete [] Buffer;
    delete [] VFList;
    return !_error->PendingError();
 }
                                                                        /*}}}*/
 // ShowDepends - Helper for printing out a dependency tree             /*{{{*/

-bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
+static bool ShowDepends(CommandLine &CmdL, bool const RevDepends)

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();


@@ -586,15 +675,16 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
       return false;
 
    CacheSetHelperVirtuals helper(false);
       return false;
 
    CacheSetHelperVirtuals helper(false);

-   APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper);
+   APT::VersionList verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::CacheSetHelper::CANDIDATE, helper);

    if (verset.empty() == true && helper.virtualPkgs.empty() == true)
    if (verset.empty() == true && helper.virtualPkgs.empty() == true)

-      return false;
+      return _error->Error(_("No packages found"));

    std::vector<bool> Shown(Cache->Head().PackageCount);
 
    bool const Recurse = _config->FindB("APT::Cache::RecurseDepends", false);
    bool const Installed = _config->FindB("APT::Cache::Installed", false);
    bool const Important = _config->FindB("APT::Cache::Important", false);
    bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType", RevDepends == false);
    std::vector<bool> Shown(Cache->Head().PackageCount);
 
    bool const Recurse = _config->FindB("APT::Cache::RecurseDepends", false);
    bool const Installed = _config->FindB("APT::Cache::Installed", false);
    bool const Important = _config->FindB("APT::Cache::Important", false);
    bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType", RevDepends == false);

+   bool const ShowVersion = _config->FindB("APT::Cache::ShowVersion", false);

    bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true);
    bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true);
    bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false);
    bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true);
    bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true);
    bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false);


@@ -604,6 +694,7 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
    bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false);
    bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false);
    bool const ShowOnlyFirstOr = _config->FindB("APT::Cache::ShowOnlyFirstOr", false);
    bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false);
    bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false);
    bool const ShowOnlyFirstOr = _config->FindB("APT::Cache::ShowOnlyFirstOr", false);

+   bool const ShowImplicit = _config->FindB("APT::Cache::ShowImplicit", false);

 
    while (verset.empty() != true)
    {
 
    while (verset.empty() != true)
    {


@@ -617,7 +708,7 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
         if (RevDepends == true)
            cout << "Reverse Depends:" << endl;
         for (pkgCache::DepIterator D = RevDepends ? Pkg.RevDependsList() : Ver.DependsList();
         if (RevDepends == true)
            cout << "Reverse Depends:" << endl;
         for (pkgCache::DepIterator D = RevDepends ? Pkg.RevDependsList() : Ver.DependsList();

-             D.end() == false; D++)
+             D.end() == false; ++D)

         {
            switch (D->Type) {
            case pkgCache::Dep::PreDepends: if (!ShowPreDepends) continue; break;
         {
            switch (D->Type) {
            case pkgCache::Dep::PreDepends: if (!ShowPreDepends) continue; break;


@@ -629,8 +720,11 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
            case pkgCache::Dep::DpkgBreaks: if (!ShowBreaks) continue; break;
            case pkgCache::Dep::Enhances: if (!ShowEnhances) continue; break;
            }
            case pkgCache::Dep::DpkgBreaks: if (!ShowBreaks) continue; break;
            case pkgCache::Dep::Enhances: if (!ShowEnhances) continue; break;
            }

+           if (ShowImplicit == false && D.IsImplicit())
+              continue;

 
            pkgCache::PkgIterator Trg = RevDepends ? D.ParentPkg() : D.TargetPkg();
 
            pkgCache::PkgIterator Trg = RevDepends ? D.ParentPkg() : D.TargetPkg();

+           bool const showNoArch = RevDepends || (D->CompareOp & pkgCache::Dep::ArchSpecific) != pkgCache::Dep::ArchSpecific;

 
            if((Installed && Trg->CurrentVer != 0) || !Installed)
              {
 
            if((Installed && Trg->CurrentVer != 0) || !Installed)
              {


@@ -644,22 +738,25 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
                if (ShowDepType == true)
                  cout << D.DepType() << ": ";
                if (Trg->VersionList == 0)
                if (ShowDepType == true)
                  cout << D.DepType() << ": ";
                if (Trg->VersionList == 0)

-                 cout << "<" << Trg.FullName(true) << ">" << endl;
+                 cout << "<" << Trg.FullName(showNoArch) << ">";

                else
                else

-                 cout << Trg.FullName(true) << endl;
-           
+                 cout << Trg.FullName(showNoArch);
+               if (ShowVersion == true && D->Version != 0)
+                  cout << " (" << pkgCache::CompTypeDeb(D->CompareOp) << ' ' << D.TargetVer() << ')';
+               cout << std::endl;
+

                if (Recurse == true && Shown[Trg->ID] == false)
                {
                  Shown[Trg->ID] = true;
                if (Recurse == true && Shown[Trg->ID] == false)
                {
                  Shown[Trg->ID] = true;

-                 verset.insert(APT::VersionSet::FromPackage(CacheFile, Trg, APT::VersionSet::CANDIDATE, helper));
+                 verset.insert(APT::VersionSet::FromPackage(CacheFile, Trg, APT::CacheSetHelper::CANDIDATE, helper));

                }
 
              }
            
            // Display all solutions
                }
 
              }
            
            // Display all solutions

-           SPtrArray<pkgCache::Version *> List = D.AllTargets();
-           pkgPrioSortList(*Cache,List);
-           for (pkgCache::Version **I = List; *I != 0; I++)
+           std::unique_ptr<pkgCache::Version *[]> List(D.AllTargets());
+           pkgPrioSortList(*Cache,List.get());
+           for (pkgCache::Version **I = List.get(); *I != 0; I++)

            {
               pkgCache::VerIterator V(*Cache,*I);
               if (V != Cache->VerP + V.ParentPkg()->VersionList ||
            {
               pkgCache::VerIterator V(*Cache,*I);
               if (V != Cache->VerP + V.ParentPkg()->VersionList ||


@@ -670,7 +767,7 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
                if (Recurse == true && Shown[V.ParentPkg()->ID] == false)
                {
                  Shown[V.ParentPkg()->ID] = true;
                if (Recurse == true && Shown[V.ParentPkg()->ID] == false)
                {
                  Shown[V.ParentPkg()->ID] = true;

-                 verset.insert(APT::VersionSet::FromPackage(CacheFile, V.ParentPkg(), APT::VersionSet::CANDIDATE, helper));
+                 verset.insert(APT::VersionSet::FromPackage(CacheFile, V.ParentPkg(), APT::CacheSetHelper::CANDIDATE, helper));

                }
            }
 
                }
            }
 


@@ -689,7 +786,7 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
 // Depends - Print out a dependency tree                               /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Depends - Print out a dependency tree                               /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
    return ShowDepends(CmdL, false);
 }
 {
    return ShowDepends(CmdL, false);
 }


@@ -697,7 +794,7 @@ bool Depends(CommandLine &CmdL)
 // RDepends - Print out a reverse dependency tree                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // RDepends - Print out a reverse dependency tree                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
    return ShowDepends(CmdL, true);
 }
 {
    return ShowDepends(CmdL, true);
 }


@@ -706,7 +803,7 @@ bool RDepends(CommandLine &CmdL)
 // ---------------------------------------------------------------------
 // Code contributed from Junichi Uekawa <dancer@debian.org> on 20 June 2002.
 
 // ---------------------------------------------------------------------
 // Code contributed from Junichi Uekawa <dancer@debian.org> on 20 June 2002.
 

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

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();


@@ -743,7 +840,7 @@ bool XVcg(CommandLine &CmdL)
    memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount);
    
    // Map the shapes
    memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount);
    
    // 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)
       {


@@ -765,9 +862,9 @@ bool XVcg(CommandLine &CmdL)
 
    // Load the list of packages from the command line into the show list
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);
 
    // Load the list of packages from the command line into the show list
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);

-   std::list<APT::PackageSet::Modifier> mods;
-   mods.push_back(APT::PackageSet::Modifier(0, ",", APT::PackageSet::Modifier::POSTFIX));
-   mods.push_back(APT::PackageSet::Modifier(1, "^", APT::PackageSet::Modifier::POSTFIX));
+   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);
 
    std::map<unsigned short, APT::PackageSet> pkgsets =
                APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0, helper);
 


@@ -790,7 +887,7 @@ bool XVcg(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)


@@ -816,14 +913,14 @@ bool XVcg(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)
                  Hit = true;
            {
               if (Cache->VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true)
                  Hit = true;


@@ -831,7 +928,7 @@ bool XVcg(CommandLine &CmdL)
            
            // Follow all provides
            for (pkgCache::PrvIterator I = DPkg.ProvidesList(); 
            
            // 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)
                  Hit = true;
            {
               if (Cache->VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false)
                  Hit = true;


@@ -848,10 +945,7 @@ bool XVcg(CommandLine &CmdL)
               {
                  /* If a conflicts does not meet anything in the database
                     then show the relation but do not recurse */
               {
                  /* 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::DpkgBreaks ||
-                      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)


@@ -894,7 +988,7 @@ bool XVcg(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;
    {
       if (Show[Pkg->ID] < DoneNR)
         continue;


@@ -921,7 +1015,7 @@ bool XVcg(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)

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();


@@ -958,7 +1052,7 @@ bool Dotty(CommandLine &CmdL)
    memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount);
    
    // Map the shapes
    memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount);
    
    // 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)
       {


@@ -980,9 +1074,9 @@ bool Dotty(CommandLine &CmdL)
 
    // Load the list of packages from the command line into the show list
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);
 
    // Load the list of packages from the command line into the show list
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);

-   std::list<APT::PackageSet::Modifier> mods;
-   mods.push_back(APT::PackageSet::Modifier(0, ",", APT::PackageSet::Modifier::POSTFIX));
-   mods.push_back(APT::PackageSet::Modifier(1, "^", APT::PackageSet::Modifier::POSTFIX));
+   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);
 
    std::map<unsigned short, APT::PackageSet> pkgsets =
                APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0, helper);
 


@@ -1005,7 +1099,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)


@@ -1029,14 +1123,14 @@ 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)
                  Hit = true;
            {
               if (Cache->VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true)
                  Hit = true;


@@ -1044,7 +1138,7 @@ bool Dotty(CommandLine &CmdL)
            
            // Follow all provides
            for (pkgCache::PrvIterator I = DPkg.ProvidesList(); 
            
            // 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)
                  Hit = true;
            {
               if (Cache->VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false)
                  Hit = true;


@@ -1060,9 +1154,7 @@ bool Dotty(CommandLine &CmdL)
               {
                  /* If a conflicts does not meet anything in the database
                     then show the relation but do not recurse */
               {
                  /* 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)


@@ -1082,6 +1174,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;
                  


@@ -1100,7 +1193,7 @@ 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;
    {
       if (Show[Pkg->ID] < DoneNR)
         continue;


@@ -1115,66 +1208,35 @@ bool Dotty(CommandLine &CmdL)
    }
    
    printf("}\n");
    }
    
    printf("}\n");

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

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

-// DoAdd - Perform an adding operation                                 /*{{{*/
+// DisplayRecord - Displays the complete record for the package                /*{{{*/

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

-/* */
-bool DoAdd(CommandLine &CmdL)
-{
-   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)
-      return false;
-
-   OpTextProgress Progress(*_config);
-   pkgCacheGenerator Gen(Map,Progress);
-   if (_error->PendingError() == true)
-      return false;
+/* This displays the package record from the proper package index file. 
+   It is not used by DumpAvail for performance reasons. */

 
 

-   unsigned long Length = CmdL.FileSize() - 1;
-   for (const char **I = CmdL.FileList + 1; *I != 0; I++)
+static APT_PURE unsigned char const* skipDescriptionFields(unsigned char const * DescP)
+{
+   char const * const TagName = "\nDescription";
+   size_t const TagLen = strlen(TagName);
+   while ((DescP = (unsigned char*)strchr((char*)DescP, '\n')) != NULL)

    {
    {

-      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");
+      if (DescP[1] == ' ')
+        DescP += 2;
+      else if (strncmp((char*)DescP, TagName, TagLen) == 0)
+        DescP += TagLen;
+      else
+        break;

    }
    }

-
-   Progress.Done();
-   GCache = &Gen.GetCache();
-   Stats(CmdL);
-   
-   return true;
-#endif   
+   if (DescP != NULL)
+      ++DescP;
+   return DescP;

 }
 }

-                                                                       /*}}}*/
-// 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(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
+static bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)

 {
    pkgCache *Cache = CacheFile.GetPkgCache();
    if (unlikely(Cache == NULL))
 {
    pkgCache *Cache = CacheFile.GetPkgCache();
    if (unlikely(Cache == NULL))


@@ -1182,7 +1244,7 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
 
    // Find an appropriate file
    pkgCache::VerFileIterator Vf = V.FileList();
 
    // Find an appropriate file
    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.end() == true)
       if ((Vf.File()->Flags & pkgCache::Flag::NotSource) == 0)
         break;
    if (Vf.end() == true)


@@ -1194,24 +1256,30 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
       return _error->Error(_("Package file %s is out of sync."),I.FileName());
 
    FileFd PkgF;
       return _error->Error(_("Package file %s is out of sync."),I.FileName());
 
    FileFd PkgF;

-   if (PkgF.Open(I.FileName(), FileFd::ReadOnlyGzip) == false)
+   if (PkgF.Open(I.FileName(), FileFd::ReadOnly, FileFd::Extension) == false)

       return false;
 
       return false;
 

-   // Read the record
-   unsigned char *Buffer = new unsigned char[Cache->HeaderP->MaxVerFileSize+1];
-   Buffer[V.FileList()->Size] = '\n';
-   if (PkgF.Seek(V.FileList()->Offset) == false ||
-       PkgF.Read(Buffer,V.FileList()->Size) == false)
+   // Read the record (and ensure that it ends with a newline and NUL)
+   unsigned char *Buffer = new unsigned char[Cache->HeaderP->MaxVerFileSize+2];
+   Buffer[Vf->Size] = '\n';
+   Buffer[Vf->Size+1] = '\0';
+   if (PkgF.Seek(Vf->Offset) == false ||
+       PkgF.Read(Buffer,Vf->Size) == false)

    {
       delete [] Buffer;
       return false;
    }
 
    // Get a pointer to start of Description field
    {
       delete [] Buffer;
       return false;
    }
 
    // Get a pointer to start of Description field

-   const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "Description:");
+   const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "\nDescription");
+   if (DescP != NULL)
+      ++DescP;
+   else
+      DescP = Buffer + Vf->Size;

 
    // Write all but Description
 
    // Write all but Description

-   if (fwrite(Buffer,1,DescP - Buffer,stdout) < (size_t)(DescP - Buffer))
+   size_t const length = DescP - Buffer;
+   if (length != 0 && FileFd::Write(STDOUT_FILENO, Buffer, length) == false)

    {
       delete [] Buffer;
       return false;
    {
       delete [] Buffer;
       return false;


@@ -1220,43 +1288,57 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
    // Show the right description
    pkgRecords Recs(*Cache);
    pkgCache::DescIterator Desc = V.TranslatedDescription();
    // Show the right description
    pkgRecords Recs(*Cache);
    pkgCache::DescIterator Desc = V.TranslatedDescription();

-   pkgRecords::Parser &P = Recs.Lookup(Desc.FileList());
-   cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc();
+   if (Desc.end() == false)
+   {
+      pkgRecords::Parser &P = Recs.Lookup(Desc.FileList());
+      cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc();
+      cout << std::endl << "Description-md5: " << Desc.md5() << std::endl;

 
 

-   // Find the first field after the description (if there is any)
-   for(DescP++;DescP != &Buffer[V.FileList()->Size];DescP++) 
+      // Find the first field after the description (if there is any)
+      DescP = skipDescriptionFields(DescP);
+   }
+   // else we have no translation, so we found a lonely Description-md5 -> don't skip it
+
+   // write the rest of the buffer, but skip mixed in Descriptions* fields
+   while (DescP != NULL)

    {
    {

-      if(*DescP == '\n' && *(DescP+1) != ' ') 
+      const unsigned char * const Start = DescP;
+      const unsigned char *End = (unsigned char*)strstr((char*)DescP, "\nDescription");
+      if (End == NULL)

       {
       {

-        // write the rest of the buffer
-        const unsigned char *end=&Buffer[V.FileList()->Size];
-        if (fwrite(DescP,1,end-DescP,stdout) < (size_t)(end-DescP)) 
-        {
-           delete [] Buffer;
-           return false;
-        }
-
-        break;
+        End = &Buffer[Vf->Size];
+        DescP = NULL;
+      }
+      else
+      {
+        ++End; // get the newline into the output
+        DescP = skipDescriptionFields(End + strlen("Description"));
+      }
+      size_t const length = End - Start;
+      if (length != 0 && FileFd::Write(STDOUT_FILENO, Start, length) == false)
+      {
+        delete [] Buffer;
+        return false;

       }
    }
       }
    }

-   // write a final newline (after the description)
+
+   // write a final newline after the last field

    cout<<endl;
    cout<<endl;

-   delete [] Buffer;

 
 

+   delete [] Buffer;

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

-

 struct ExDescFile
 {
    pkgCache::DescFile *Df;
 struct ExDescFile
 {
    pkgCache::DescFile *Df;

-   bool NameMatch;
+   map_id_t ID;

 };
 
 // Search - Perform a search                                           /*{{{*/
 // ---------------------------------------------------------------------
 /* This searches the package names and package descriptions for a pattern */
 };
 
 // Search - Perform a search                                           /*{{{*/
 // ---------------------------------------------------------------------
 /* This searches the package names and package descriptions for a pattern */

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

 {
    bool const ShowFull = _config->FindB("APT::Cache::ShowFull",false);
    bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly",false);
 {
    bool const ShowFull = _config->FindB("APT::Cache::ShowFull",false);
    bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly",false);


@@ -1293,75 +1375,106 @@ bool Search(CommandLine &CmdL)
       return false;
    }
    
       return false;
    }
    

-   ExDescFile *DFList = new ExDescFile[Cache->HeaderP->GroupCount+1];
-   memset(DFList,0,sizeof(*DFList)*Cache->HeaderP->GroupCount+1);
+   size_t const descCount = Cache->HeaderP->GroupCount + 1;
+   ExDescFile *DFList = new ExDescFile[descCount];
+   memset(DFList,0,sizeof(*DFList) * descCount);
+
+   bool *PatternMatch = new bool[descCount * NumPatterns];
+   memset(PatternMatch,false,sizeof(*PatternMatch) * descCount * NumPatterns);

 
    // Map versions that we want to write out onto the VerList array.
    for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G)
    {
 
    // Map versions that we want to write out onto the VerList array.
    for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G)
    {

-      if (DFList[G->ID].NameMatch == true)
-        continue;
-
-      DFList[G->ID].NameMatch = true;
-      for (unsigned I = 0; I != NumPatterns; I++)
+      size_t const PatternOffset = G->ID * NumPatterns;
+      size_t unmatched = 0, matched = 0;
+      for (unsigned I = 0; I < NumPatterns; ++I)

       {
       {

-        if (regexec(&Patterns[I],G.Name(),0,0,0) == 0)
-           continue;
-        DFList[G->ID].NameMatch = false;
-        break;
+        if (PatternMatch[PatternOffset + I] == true)
+           ++matched;
+        else if (regexec(&Patterns[I],G.Name(),0,0,0) == 0)
+           PatternMatch[PatternOffset + I] = true;
+        else
+           ++unmatched;

       }
       }

-        
-      // Doing names only, drop any that dont match..
-      if (NamesOnly == true && DFList[G->ID].NameMatch == false)
+
+      // already dealt with this package?
+      if (matched == NumPatterns)

         continue;
         continue;

-        
+
+      // Doing names only, drop any that don't match..
+      if (NamesOnly == true && unmatched == NumPatterns)
+        continue;
+

       // Find the proper version to use
       pkgCache::PkgIterator P = G.FindPreferredPkg();
       if (P.end() == true)
         continue;
       pkgCache::VerIterator V = Plcy->GetCandidateVer(P);
       if (V.end() == false)
       // Find the proper version to use
       pkgCache::PkgIterator P = G.FindPreferredPkg();
       if (P.end() == true)
         continue;
       pkgCache::VerIterator V = Plcy->GetCandidateVer(P);
       if (V.end() == false)

-        DFList[G->ID].Df = V.DescriptionList().FileList();
+      {
+        pkgCache::DescIterator const D = V.TranslatedDescription();
+        //FIXME: packages without a description can't be found
+        if (D.end() == true)
+           continue;
+        DFList[G->ID].Df = D.FileList();
+        DFList[G->ID].ID = G->ID;
+      }

 
 

-      if (DFList[G->ID].NameMatch == false)
+      if (unmatched == NumPatterns)

         continue;
 
       // Include all the packages that provide matching names too
         continue;
 
       // Include all the packages that provide matching names too

-      for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; Prv++)
+      for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; ++Prv)

       {
         pkgCache::VerIterator V = Plcy->GetCandidateVer(Prv.OwnerPkg());
         if (V.end() == true)
            continue;
 
         unsigned long id = Prv.OwnerPkg().Group()->ID;
       {
         pkgCache::VerIterator V = Plcy->GetCandidateVer(Prv.OwnerPkg());
         if (V.end() == true)
            continue;
 
         unsigned long id = Prv.OwnerPkg().Group()->ID;

-        DFList[id].Df = V.DescriptionList().FileList();
-        DFList[id].NameMatch = true;
+        pkgCache::DescIterator const D = V.TranslatedDescription();
+        //FIXME: packages without a description can't be found
+        if (D.end() == true)
+           continue;
+        DFList[id].Df = D.FileList();
+        DFList[id].ID = id;
+
+        size_t const PrvPatternOffset = id * NumPatterns;
+        for (unsigned I = 0; I < NumPatterns; ++I)
+           PatternMatch[PrvPatternOffset + I] = PatternMatch[PatternOffset + I];

       }
    }
       }
    }

-   
+

    LocalitySort(&DFList->Df,Cache->HeaderP->GroupCount,sizeof(*DFList));
 
    // Create the text record parser
    pkgRecords Recs(*Cache);
    // Iterate over all the version records and check them
    LocalitySort(&DFList->Df,Cache->HeaderP->GroupCount,sizeof(*DFList));
 
    // Create the text record parser
    pkgRecords Recs(*Cache);
    // Iterate over all the version records and check them

-   for (ExDescFile *J = DFList; J->Df != 0; J++)
+   for (ExDescFile *J = DFList; J->Df != 0; ++J)

    {
       pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(*Cache,J->Df));
    {
       pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(*Cache,J->Df));

+      size_t const PatternOffset = J->ID * NumPatterns;

 
 

-      if (J->NameMatch == false && NamesOnly == false)
+      if (NamesOnly == false)

       {
         string const LongDesc = P.LongDesc();
       {
         string const LongDesc = P.LongDesc();

-        J->NameMatch = true;
-        for (unsigned I = 0; I != NumPatterns; I++)
+        for (unsigned I = 0; I < NumPatterns; ++I)

         {
         {

-           if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0)
+           if (PatternMatch[PatternOffset + I] == true)

               continue;
               continue;

-           J->NameMatch = false;
-           break;
+           else if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0)
+              PatternMatch[PatternOffset + I] = true;

         }
       }
         }
       }

-      
-      if (J->NameMatch == true)
+
+      bool matchedAll = true;
+      for (unsigned I = 0; I < NumPatterns; ++I)
+        if (PatternMatch[PatternOffset + I] == false)
+        {
+           matchedAll = false;
+           break;
+        }
+
+      if (matchedAll == true)

       {
         if (ShowFull == true)
         {
       {
         if (ShowFull == true)
         {


@@ -1377,16 +1490,17 @@ bool Search(CommandLine &CmdL)
    }
    
    delete [] DFList;
    }
    
    delete [] DFList;

+   delete [] PatternMatch;

    for (unsigned I = 0; I != NumPatterns; I++)
       regfree(&Patterns[I]);
    for (unsigned I = 0; I != NumPatterns; I++)
       regfree(&Patterns[I]);

+   delete [] Patterns;

    if (ferror(stdout))
        return _error->Error("Write to stdout failed");
    return true;
 }
    if (ferror(stdout))
        return _error->Error("Write to stdout failed");
    return true;
 }

-
-
-/* show automatically installed packages (sorted) */
-bool ShowAuto(CommandLine &CmdL)
+                                                                       /*}}}*/
+/* ShowAuto - show automatically installed packages (sorted)           {{{*/
+static bool ShowAuto(CommandLine &)

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();


@@ -1397,29 +1511,30 @@ bool ShowAuto(CommandLine &CmdL)
    std::vector<string> packages;
    packages.reserve(Cache->HeaderP->PackageCount / 3);
    
    std::vector<string> packages;
    packages.reserve(Cache->HeaderP->PackageCount / 3);
    

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

       if ((*DepCache)[P].Flags & pkgCache::Flag::Auto)
          packages.push_back(P.Name());
 
     std::sort(packages.begin(), packages.end());
     
       if ((*DepCache)[P].Flags & pkgCache::Flag::Auto)
          packages.push_back(P.Name());
 
     std::sort(packages.begin(), packages.end());
     

-    for (vector<string>::iterator I = packages.begin(); I != packages.end(); I++)
+    for (vector<string>::iterator I = packages.begin(); I != packages.end(); ++I)

             cout << *I << "\n";
 
             cout << *I << "\n";
 

+   _error->Notice(_("This command is deprecated. Please use 'apt-mark showauto' instead."));

    return true;
 }
                                                                        /*}}}*/
 // ShowPackage - Dump the package record to the screen                 /*{{{*/
 // ---------------------------------------------------------------------
 /* */
    return true;
 }
                                                                        /*}}}*/
 // ShowPackage - Dump the package record to the screen                 /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
    pkgCacheFile CacheFile;
    CacheSetHelperVirtuals helper(true, GlobalError::NOTICE);
 {
    pkgCacheFile CacheFile;
    CacheSetHelperVirtuals helper(true, GlobalError::NOTICE);

-   APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ?
-                       APT::VersionSet::ALL : APT::VersionSet::CANDIDATE;
-   APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper);
-   for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver)
+   APT::CacheSetHelper::VerSelector const select = _config->FindB("APT::Cache::AllVersions", true) ?
+                       APT::CacheSetHelper::ALL : APT::CacheSetHelper::CANDIDATE;
+   APT::VersionList const verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper);
+   for (APT::VersionList::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver)

       if (DisplayRecord(CacheFile, Ver) == false)
         return false;
 
       if (DisplayRecord(CacheFile, Ver) == false)
         return false;
 


@@ -1436,7 +1551,7 @@ bool ShowPackage(CommandLine &CmdL)
 // ShowPkgNames - Show package names                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* This does a prefix match on the first argument */
 // ShowPkgNames - Show package names                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* This does a prefix match on the first argument */

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

 {
    pkgCacheFile CacheFile;
    if (unlikely(CacheFile.BuildCaches(NULL, false) == false))
 {
    pkgCacheFile CacheFile;
    if (unlikely(CacheFile.BuildCaches(NULL, false) == false))


@@ -1446,7 +1561,7 @@ bool ShowPkgNames(CommandLine &CmdL)
 
    if (CmdL.FileList[1] != 0)
    {
 
    if (CmdL.FileList[1] != 0)
    {

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

       {
         if (All == false && I->FirstPackage == 0)
            continue;
       {
         if (All == false && I->FirstPackage == 0)
            continue;


@@ -1460,7 +1575,7 @@ bool ShowPkgNames(CommandLine &CmdL)
    }
    
    // Show all pkgs
    }
    
    // Show all pkgs

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

    {
       if (All == false && I->FirstPackage == 0)
         continue;
    {
       if (All == false && I->FirstPackage == 0)
         continue;


@@ -1475,7 +1590,7 @@ bool ShowPkgNames(CommandLine &CmdL)
 // ShowSrcPackage - Show source package records                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowSrcPackage - Show source package records                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
    pkgCacheFile CacheFile;
    pkgSourceList *List = CacheFile.GetSourceList();
 {
    pkgCacheFile CacheFile;
    pkgSourceList *List = CacheFile.GetSourceList();


@@ -1512,7 +1627,7 @@ bool ShowSrcPackage(CommandLine &CmdL)
 // Policy - Show the results of the preferences file                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Policy - Show the results of the preferences file                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();


@@ -1531,8 +1646,10 @@ bool Policy(CommandLine &CmdL)
    if (CmdL.FileList[1] == 0)
    {
       cout << _("Package files:") << endl;   
    if (CmdL.FileList[1] == 0)
    {
       cout << _("Package files:") << endl;   

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

       {
       {

+        if (F.Flagged(pkgCache::Flag::NoPackages))
+           continue;

         // Locate the associated index files so we can derive a description
         pkgIndexFile *Indx;
         if (SrcList->FindIndex(F,Indx) == false &&
         // Locate the associated index files so we can derive a description
         pkgIndexFile *Indx;
         if (SrcList->FindIndex(F,Indx) == false &&


@@ -1553,25 +1670,38 @@ bool Policy(CommandLine &CmdL)
       // Show any packages have explicit pins
       cout << _("Pinned packages:") << endl;
       pkgCache::PkgIterator I = Cache->PkgBegin();
       // Show any packages have explicit pins
       cout << _("Pinned packages:") << endl;
       pkgCache::PkgIterator I = Cache->PkgBegin();

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

       {
       {

-        if (Plcy->GetPriority(I) == 0)
+        // Old code for debugging
+        if (_config->FindI("APT::Policy", 1) < 1) {
+           if (Plcy->GetPriority(I) == 0)
+              continue;
+
+           // Print the package name and the version we are forcing to
+           cout << "     " << I.FullName(true) << " -> ";
+
+           pkgCache::VerIterator V = Plcy->GetMatch(I);
+           if (V.end() == true)
+              cout << _("(not found)") << endl;
+           else
+              cout << V.VerStr() << endl;
+

            continue;
            continue;

+        }
+        // New code
+        for (pkgCache::VerIterator V = I.VersionList(); !V.end(); V++) {
+           auto Prio = Plcy->GetPriority(V, false);
+           if (Prio == 0)
+              continue;

 
 

-        // Print the package name and the version we are forcing to
-        cout << "     " << I.FullName(true) << " -> ";
-        
-        pkgCache::VerIterator V = Plcy->GetMatch(I);
-        if (V.end() == true)
-           cout << _("(not found)") << endl;
-        else
-           cout << V.VerStr() << endl;
-      }     
-      
+           cout << "     ";
+           // Print the package name and the version we are forcing to
+           ioprintf(cout, _("%s -> %s with priority %d\n"), I.FullName(true).c_str(), V.VerStr(), Prio);
+        }
+      }

       return true;
    }
 
       return true;
    }
 

-   string const myArch = _config->Find("APT::Architecture");

    char const * const msgInstalled = _("  Installed: ");
    char const * const msgCandidate = _("  Candidate: ");
    short const InstalledLessCandidate =
    char const * const msgInstalled = _("  Installed: ");
    char const * const msgCandidate = _("  Candidate: ");
    short const InstalledLessCandidate =


@@ -1583,15 +1713,9 @@ bool Policy(CommandLine &CmdL)
 
    // Print out detailed information for each package
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);
 
    // Print out detailed information for each package
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);

-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper);
-   for (APT::PackageSet::const_iterator I = pkgset.begin(); I != pkgset.end(); ++I)
+   APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1, helper);
+   for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)

    {
    {

-      pkgCache::PkgIterator Pkg = I.Group().FindPkg("any");
-
-      for (; Pkg.end() != true; Pkg = I.Group().NextPkg(Pkg)) {
-      if (strcmp(Pkg.Arch(),"all") == 0)
-        continue;
-

       cout << Pkg.FullName(true) << ":" << endl;
 
       // Installed version
       cout << Pkg.FullName(true) << ":" << endl;
 
       // Installed version


@@ -1610,7 +1734,7 @@ bool Policy(CommandLine &CmdL)
         cout << V.VerStr() << endl;
 
       // Pinned version
         cout << V.VerStr() << endl;
 
       // Pinned version

-      if (Plcy->GetPriority(Pkg) != 0)
+      if (_config->FindI("APT::Policy", 1) < 1 && Plcy->GetPriority(Pkg) != 0)

       {
         cout << _("  Package pin: ");
         V = Plcy->GetMatch(Pkg);
       {
         cout << _("  Package pin: ");
         V = Plcy->GetMatch(Pkg);


@@ -1622,14 +1746,17 @@ bool Policy(CommandLine &CmdL)
       
       // Show the priority tables
       cout << _("  Version table:") << endl;
       
       // Show the priority tables
       cout << _("  Version table:") << endl;

-      for (V = Pkg.VersionList(); V.end() == false; V++)
+      for (V = Pkg.VersionList(); V.end() == false; ++V)

       {
         if (Pkg.CurrentVer() == V)
            cout << " *** " << V.VerStr();
         else
            cout << "     " << V.VerStr();
       {
         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++)
+        if (_config->FindI("APT::Policy", 1) < 1)
+           cout << " " << Plcy->GetPriority(Pkg) << endl;
+        else
+           cout << " " << Plcy->GetPriority(V) << endl;
+        for (pkgCache::VerFileIterator VF = V.FileList(); VF.end() == false; ++VF)

         {
            // Locate the associated index files so we can derive a description
            pkgIndexFile *Indx;
         {
            // Locate the associated index files so we can derive a description
            pkgIndexFile *Indx;


@@ -1640,7 +1767,6 @@ bool Policy(CommandLine &CmdL)
                   Indx->Describe(true).c_str());
         }
       }
                   Indx->Describe(true).c_str());
         }
       }

-      }

    }
    
    return true;
    }
    
    return true;


@@ -1649,7 +1775,7 @@ bool Policy(CommandLine &CmdL)
 // Madison - Look a bit like katie's madison                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Madison - Look a bit like katie's madison                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
    pkgCacheFile CacheFile;
    pkgSourceList *SrcList = CacheFile.GetSourceList();
 {
    pkgCacheFile CacheFile;
    pkgSourceList *SrcList = CacheFile.GetSourceList();


@@ -1664,14 +1790,15 @@ bool Madison(CommandLine &CmdL)
       _error->Discard();
 
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);
       _error->Discard();
 
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);

-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper);
-   for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+   for (const char **I = CmdL.FileList + 1; *I != 0; I++)

    {
    {

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

       {
       {

-         for (pkgCache::VerIterator V = Pkg.VersionList(); V.end() == false; V++)
+         for (pkgCache::VerIterator V = Pkg.VersionList(); V.end() == false; ++V)

          {
          {

-            for (pkgCache::VerFileIterator VF = V.FileList(); VF.end() == false; VF++)
+            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)
             {
 // This might be nice, but wouldn't uniquely identify the source -mdz
 //                if (VF.File().Archive() != 0)


@@ -1681,11 +1808,11 @@ bool Madison(CommandLine &CmdL)
 //                }
 
                // Locate the associated index files so we can derive a description
 //                }
 
                // Locate the associated index files so we can derive a description

-               for (pkgSourceList::const_iterator S = SrcList->begin(); S != SrcList->end(); S++)
+               for (pkgSourceList::const_iterator S = SrcList->begin(); S != SrcList->end(); ++S)

                {
                     vector<pkgIndexFile *> *Indexes = (*S)->GetIndexFiles();
                     for (vector<pkgIndexFile *>::const_iterator IF = Indexes->begin();
                {
                     vector<pkgIndexFile *> *Indexes = (*S)->GetIndexFiles();
                     for (vector<pkgIndexFile *>::const_iterator IF = Indexes->begin();

-                         IF != Indexes->end(); IF++)
+                         IF != Indexes->end(); ++IF)

                     {
                          if ((*IF)->FindInCache(*(VF.File().Cache())) == VF.File())
                          {
                     {
                          if ((*IF)->FindInCache(*(VF.File().Cache())) == VF.File())
                          {


@@ -1698,16 +1825,21 @@ bool Madison(CommandLine &CmdL)
          }
       }
 
          }
       }
 

-      

       SrcRecs.Restart();
       pkgSrcRecords::Parser *SrcParser;
       SrcRecs.Restart();
       pkgSrcRecords::Parser *SrcParser;

-      while ((SrcParser = SrcRecs.Find(Pkg.Name(),false)) != 0)
+      bool foundSomething = false;
+      while ((SrcParser = SrcRecs.Find(*I, false)) != 0)

       {
       {

+         foundSomething = true;

          // Maybe support Release info here too eventually
          cout << setw(10) << SrcParser->Package() << " | "
               << setw(10) << SrcParser->Version() << " | "
               << SrcParser->Index().Describe(true) << endl;
       }
          // Maybe support Release info here too eventually
          cout << setw(10) << SrcParser->Package() << " | "
               << setw(10) << SrcParser->Version() << " | "
               << SrcParser->Index().Describe(true) << endl;
       }

+      if (foundSomething == true)
+        _error->RevertToStack();
+      else
+        _error->MergeWithStack();

    }
 
    return true;
    }
 
    return true;


@@ -1716,7 +1848,7 @@ bool Madison(CommandLine &CmdL)
 // GenCaches - Call the main cache generator                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // GenCaches - Call the main cache generator                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

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


@@ -1727,25 +1859,22 @@ bool GenCaches(CommandLine &Cmd)
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
 {

-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
-   
+   ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
+

    if (_config->FindB("version") == true)
      return true;
 
    cout << 
     _("Usage: apt-cache [options] command\n"
    if (_config->FindB("version") == true)
      return true;
 
    cout << 
     _("Usage: apt-cache [options] command\n"

-      "       apt-cache [options] add file1 [file2 ...]\n"

       "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
       "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
       "\n"
       "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
       "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
       "\n"

-      "apt-cache is a low-level tool used to manipulate APT's binary\n"
-      "cache files, and query information from them\n"
+      "apt-cache is a low-level tool used to query information\n"
+      "from APT's binary cache files\n"

       "\n"
       "Commands:\n"
       "\n"
       "Commands:\n"

-      "   add - Add a 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"
       "   showsrc - Show source records\n"
       "   gencaches - Build both the package and source cache\n"
       "   showpkg - Show some general information for a single package\n"
       "   showsrc - Show source records\n"


@@ -1755,7 +1884,6 @@ bool ShowHelp(CommandLine &Cmd)
       "   unmet - Show unmet dependencies\n"
       "   search - Search the package list for a regex pattern\n"
       "   show - Show a readable record for the package\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"

-      "   showauto - Display a list of automatically installed packages\n"

       "   depends - Show raw dependency information for a package\n"
       "   rdepends - Show reverse dependency information for a package\n"
       "   pkgnames - List the names of all packages in the system\n"
       "   depends - Show raw dependency information for a package\n"
       "   rdepends - Show reverse dependency information for a package\n"
       "   pkgnames - List the names of all packages in the system\n"


@@ -1775,50 +1903,12 @@ bool ShowHelp(CommandLine &Cmd)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-// CacheInitialize - Initialize things for apt-cache                   /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void CacheInitialize()
-{
-   _config->Set("quiet",0);
-   _config->Set("help",false);
-}
-                                                                       /*}}}*/

 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},
-      {'n',"names-only","APT::Cache::NamesOnly",0},
-      {0,"all-names","APT::Cache::AllNames",0},
-      {0,"recurse","APT::Cache::RecurseDepends",0},
-      {'t',"target-release","APT::Default-Release",CommandLine::HasArg},
-      {'t',"default-release","APT::Default-Release",CommandLine::HasArg},
-      {'c',"config-file",0,CommandLine::ConfigFile},
-      {'o',"option",0,CommandLine::ArbItem},
-      {0,"installed","APT::Cache::Installed",0},
-      {0,"pre-depends","APT::Cache::ShowPreDepends",0},
-      {0,"depends","APT::Cache::ShowDepends",0},
-      {0,"recommends","APT::Cache::ShowRecommends",0},
-      {0,"suggests","APT::Cache::ShowSuggests",0},
-      {0,"replaces","APT::Cache::ShowReplaces",0},
-      {0,"breaks","APT::Cache::ShowBreaks",0},
-      {0,"conflicts","APT::Cache::ShowConflicts",0},
-      {0,"enhances","APT::Cache::ShowEnhances",0},
-      {0,0,0,0}};
-   CommandLine::Dispatch CmdsA[] = {{"help",&ShowHelp},
-                                    {"add",&DoAdd},
+   CommandLine::Dispatch Cmds[] =  {{"help",&ShowHelp},

                                     {"gencaches",&GenCaches},
                                     {"showsrc",&ShowSrcPackage},
                                     {"gencaches",&GenCaches},
                                     {"showsrc",&ShowSrcPackage},

-                                    {0,0}};
-   CommandLine::Dispatch CmdsB[] = {{"showpkg",&DumpPackage},
+                                    {"showpkg",&DumpPackage},

                                     {"stats",&Stats},
                                     {"dump",&Dump},
                                     {"dumpavail",&DumpAvail},
                                     {"stats",&Stats},
                                     {"dump",&Dump},
                                     {"dumpavail",&DumpAvail},


@@ -1835,39 +1925,23 @@ int main(int argc,const char *argv[])                                   /*{{{*/
                                     {"madison",&Madison},
                                     {0,0}};
 
                                     {"madison",&Madison},
                                     {0,0}};
 

-   CacheInitialize();
+   std::vector<CommandLine::Args> Args = getCommandArgs("apt-cache", CommandLine::GetCommand(Cmds, argc, argv));

 
    // Set up gettext support
    setlocale(LC_ALL,"");
    textdomain(PACKAGE);
 
    // Parse the command line and initialize the package library
 
    // Set up gettext support
    setlocale(LC_ALL,"");
    textdomain(PACKAGE);
 
    // 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;
+   ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);

 
 

-   // 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 (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
-      _config->Set("quiet","1");
+   InitOutput();

 
    if (_config->Exists("APT::Cache::Generate") == true)
       _config->Set("pkgCacheFile::Generate", _config->FindB("APT::Cache::Generate", true));
 
 
    if (_config->Exists("APT::Cache::Generate") == true)
       _config->Set("pkgCacheFile::Generate", _config->FindB("APT::Cache::Generate", true));
 

-   if (CmdL.DispatchArg(CmdsA,false) == false && _error->PendingError() == false)
-      CmdL.DispatchArg(CmdsB);
+   // Match the operation
+   CmdL.DispatchArg(Cmds);

 
    // Print any errors or warnings found during parsing
    bool const Errors = _error->PendingError();
 
    // Print any errors or warnings found during parsing
    bool const Errors = _error->PendingError();