X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/3addaba1ff6fe27cc96af5c2d345ee039c2bffec..2853201580944cb4e5a2a8a810e800e89e9a0475:/cmdline/apt-cache.cc

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 1493b63dc..481833084 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -43,6 +43,11 @@
 
 #include <apt-private/private-cacheset.h>
 #include <apt-private/private-cmndline.h>
+#include <apt-private/private-depends.h>
+#include <apt-private/private-show.h>
+#include <apt-private/private-search.h>
+#include <apt-private/private-unmet.h>
+#include <apt-private/private-main.h>
 
 #include <regex.h>
 #include <stddef.h>
@@ -64,141 +69,6 @@
 
 using namespace std;
 
-// LocalitySort - Sort a version list by package file locality		/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static int LocalityCompare(const void *a, const void *b)
-{
-   pkgCache::VerFile *A = *(pkgCache::VerFile **)a;
-   pkgCache::VerFile *B = *(pkgCache::VerFile **)b;
-   
-   if (A == 0 && B == 0)
-      return 0;
-   if (A == 0)
-      return 1;
-   if (B == 0)
-      return -1;
-   
-   if (A->File == B->File)
-      return A->Offset - B->Offset;
-   return A->File - B->File;
-}
-
-static void LocalitySort(pkgCache::VerFile **begin,
-		  unsigned long Count,size_t Size)
-{   
-   qsort(begin,Count,Size,LocalityCompare);
-}
-
-static void LocalitySort(pkgCache::DescFile **begin,
-		  unsigned long Count,size_t Size)
-{   
-   qsort(begin,Count,Size,LocalityCompare);
-}
-									/*}}}*/
-// UnMet - Show unmet dependencies					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowUnMet(pkgCache::VerIterator const &V, bool const Important)
-{
-	 bool Header = false;
-	 for (pkgCache::DepIterator D = V.DependsList(); D.end() == false;)
-	 {
-	    // Collect or groups
-	    pkgCache::DepIterator Start;
-	    pkgCache::DepIterator End;
-	    D.GlobOr(Start,End);
-
-	    // Important deps only
-	    if (Important == true)
-	       if (End->Type != pkgCache::Dep::PreDepends &&
-	           End->Type != pkgCache::Dep::Depends)
-		  continue;
-
-	    // Skip conflicts and replaces
-	    if (End.IsNegative() == true || End->Type == pkgCache::Dep::Replaces)
-	       continue;
-
-	    // Verify the or group
-	    bool OK = false;
-	    pkgCache::DepIterator RealStart = Start;
-	    do
-	    {
-	       // See if this dep is Ok
-	       pkgCache::Version **VList = Start.AllTargets();
-	       if (*VList != 0)
-	       {
-		  OK = true;
-		  delete [] VList;
-		  break;
-	       }
-	       delete [] VList;
-
-	       if (Start == End)
-		  break;
-	       ++Start;
-	    }
-	    while (1);
-
-	    // The group is OK
-	    if (OK == true)
-	       continue;
-	    
-	    // Oops, it failed..
-	    if (Header == false)
-	       ioprintf(cout,_("Package %s version %s has an unmet dep:\n"),
-			V.ParentPkg().FullName(true).c_str(),V.VerStr());
-	    Header = true;
-	    
-	    // Print out the dep type
-	    cout << " " << End.DepType() << ": ";
-
-	    // Show the group
-	    Start = RealStart;
-	    do
-	    {
-	       cout << Start.TargetPkg().FullName(true);
-	       if (Start.TargetVer() != 0)
-		  cout << " (" << Start.CompType() << " " << Start.TargetVer() <<
-		  ")";
-	       if (Start == End)
-		  break;
-	       cout << " | ";
-	       ++Start;
-	    }
-	    while (1);
-	    
-	    cout << endl;
-	 }
-   return true;
-}
-static bool UnMet(CommandLine &CmdL)
-{
-   bool const Important = _config->FindB("APT::Cache::Important",false);
-
-   pkgCacheFile CacheFile;
-   if (unlikely(CacheFile.GetPkgCache() == NULL))
-      return false;
-
-   if (CmdL.FileSize() <= 1)
-   {
-      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;
-   }
-   else
-   {
-      CacheSetHelperVirtuals helper(true, GlobalError::NOTICE);
-      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;
-   }
-   return true;
-}
-									/*}}}*/
 // DumpPackage - Show a dump of a package record			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -302,7 +172,8 @@ static void ShowHashTableStats(std::string Type,
    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 << "  Utilization: " << 100.0 * UsedBuckets/NumBuckets << "%" << std::endl;
+   cout << "  Average entries: " << Entries/(double)UsedBuckets << std::endl;
    cout << "  Longest: " << LongestBucket << std::endl;
    cout << "  Shortest: " << ShortestBucket << std::endl;
 }
@@ -312,13 +183,14 @@ static void ShowHashTableStats(std::string Type,
 /* */
 static bool Stats(CommandLine &CmdL)
 {
-   pkgCacheFile CacheFile;
-   pkgCache *Cache = CacheFile.GetPkgCache();
-
    if (CmdL.FileSize() > 1) {
       _error->Error(_("apt-cache stats does not take any arguments"));
       return false;
    }
+
+   pkgCacheFile CacheFile;
+   pkgCache *Cache = CacheFile.GetPkgCache();
+
    if (unlikely(Cache == NULL))
       return false;
 
@@ -666,138 +538,6 @@ static bool DumpAvail(CommandLine &)
    return !_error->PendingError();
 }
 									/*}}}*/
-// ShowDepends - Helper for printing out a dependency tree		/*{{{*/
-static bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
-{
-   pkgCacheFile CacheFile;
-   pkgCache *Cache = CacheFile.GetPkgCache();
-   if (unlikely(Cache == NULL))
-      return false;
-
-   CacheSetHelperVirtuals helper(false);
-   APT::VersionList verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::CacheSetHelper::CANDIDATE, helper);
-   if (verset.empty() == true && helper.virtualPkgs.empty() == true)
-      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);
-   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 ShowSuggests = _config->FindB("APT::Cache::ShowSuggests", Important == false);
-   bool const ShowReplaces = _config->FindB("APT::Cache::ShowReplaces", Important == false);
-   bool const ShowConflicts = _config->FindB("APT::Cache::ShowConflicts", Important == 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)
-   {
-      pkgCache::VerIterator Ver = *verset.begin();
-      verset.erase(verset.begin());
-      pkgCache::PkgIterator Pkg = Ver.ParentPkg();
-      Shown[Pkg->ID] = true;
-
-	 cout << Pkg.FullName(true) << endl;
-
-	 if (RevDepends == true)
-	    cout << "Reverse Depends:" << endl;
-	 for (pkgCache::DepIterator D = RevDepends ? Pkg.RevDependsList() : Ver.DependsList();
-	      D.end() == false; ++D)
-	 {
-	    switch (D->Type) {
-	    case pkgCache::Dep::PreDepends: if (!ShowPreDepends) continue; break;
-	    case pkgCache::Dep::Depends: if (!ShowDepends) continue; break;
-	    case pkgCache::Dep::Recommends: if (!ShowRecommends) continue; break;
-	    case pkgCache::Dep::Suggests: if (!ShowSuggests) continue; break;
-	    case pkgCache::Dep::Replaces: if (!ShowReplaces) continue; break;
-	    case pkgCache::Dep::Conflicts: if (!ShowConflicts) 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();
-
-	    if((Installed && Trg->CurrentVer != 0) || !Installed)
-	      {
-
-		if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or && ShowOnlyFirstOr == false)
-		  cout << " |";
-		else
-		  cout << "  ";
-	    
-		// Show the package
-		if (ShowDepType == true)
-		  cout << D.DepType() << ": ";
-		if (Trg->VersionList == 0)
-		  cout << "<" << Trg.FullName(true) << ">";
-		else
-		  cout << Trg.FullName(true);
-		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;
-		  verset.insert(APT::VersionSet::FromPackage(CacheFile, Trg, APT::CacheSetHelper::CANDIDATE, helper));
-		}
-
-	      }
-	    
-	    // Display all solutions
-	    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 ||
-		   V->ParentPkg == D->Package)
-		  continue;
-	       cout << "    " << V.ParentPkg().FullName(true) << endl;
-
-		if (Recurse == true && Shown[V.ParentPkg()->ID] == false)
-		{
-		  Shown[V.ParentPkg()->ID] = true;
-		  verset.insert(APT::VersionSet::FromPackage(CacheFile, V.ParentPkg(), APT::CacheSetHelper::CANDIDATE, helper));
-		}
-	    }
-
-	    if (ShowOnlyFirstOr == true)
-	       while ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) ++D;
-	 }
-   }
-
-   for (APT::PackageSet::const_iterator Pkg = helper.virtualPkgs.begin();
-	Pkg != helper.virtualPkgs.end(); ++Pkg)
-      cout << '<' << Pkg.FullName(true) << '>' << endl;
-
-   return true;
-}
-									/*}}}*/
-// Depends - Print out a dependency tree				/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool Depends(CommandLine &CmdL)
-{
-   return ShowDepends(CmdL, false);
-}
-									/*}}}*/
-// RDepends - Print out a reverse dependency tree			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool RDepends(CommandLine &CmdL)
-{
-   return ShowDepends(CmdL, true);
-}
-									/*}}}*/
 // xvcg - Generate a graph for xvcg					/*{{{*/
 // ---------------------------------------------------------------------
 // Code contributed from Junichi Uekawa <dancer@debian.org> on 20 June 2002.
@@ -1213,288 +953,6 @@ static bool Dotty(CommandLine &CmdL)
    return true;
 }
 									/*}}}*/
-// 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. */
-
-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)
-   {
-      if (DescP[1] == ' ')
-	 DescP += 2;
-      else if (strncmp((char*)DescP, TagName, TagLen) == 0)
-	 DescP += TagLen;
-      else
-	 break;
-   }
-   if (DescP != NULL)
-      ++DescP;
-   return DescP;
-}
-static bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
-{
-   pkgCache *Cache = CacheFile.GetPkgCache();
-   if (unlikely(Cache == NULL))
-      return false;
-
-   // Find an appropriate file
-   pkgCache::VerFileIterator Vf = V.FileList();
-   for (; Vf.end() == false; ++Vf)
-      if ((Vf.File()->Flags & pkgCache::Flag::NotSource) == 0)
-	 break;
-   if (Vf.end() == true)
-      Vf = V.FileList();
-      
-   // Check and load the package list file
-   pkgCache::PkgFileIterator I = Vf.File();
-   if (I.IsOk() == false)
-      return _error->Error(_("Package file %s is out of sync."),I.FileName());
-
-   FileFd PkgF;
-   if (PkgF.Open(I.FileName(), FileFd::ReadOnly, FileFd::Extension) == false)
-      return 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
-   const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "\nDescription");
-   if (DescP != NULL)
-      ++DescP;
-   else
-      DescP = Buffer + Vf->Size;
-
-   // Write all but Description
-   size_t const length = DescP - Buffer;
-   if (length != 0 && FileFd::Write(STDOUT_FILENO, Buffer, length) == false)
-   {
-      delete [] Buffer;
-      return false;
-   }
-
-   // Show the right description
-   pkgRecords Recs(*Cache);
-   pkgCache::DescIterator Desc = V.TranslatedDescription();
-   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)
-      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)
-   {
-      const unsigned char * const Start = DescP;
-      const unsigned char *End = (unsigned char*)strstr((char*)DescP, "\nDescription");
-      if (End == NULL)
-      {
-	 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 last field
-   cout<<endl;
-
-   delete [] Buffer;
-   return true;
-}
-									/*}}}*/
-struct ExDescFile
-{
-   pkgCache::DescFile *Df;
-   pkgCache::VerIterator V;
-   map_id_t ID;
-};
-
-// Search - Perform a search						/*{{{*/
-// ---------------------------------------------------------------------
-/* This searches the package names and package descriptions for a pattern */
-static bool Search(CommandLine &CmdL)
-{
-   bool const ShowFull = _config->FindB("APT::Cache::ShowFull",false);
-   bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly",false);
-   unsigned int const NumPatterns = CmdL.FileSize() -1;
-   
-   pkgCacheFile CacheFile;
-   pkgCache *Cache = CacheFile.GetPkgCache();
-   pkgDepCache::Policy *Plcy = CacheFile.GetPolicy();
-   if (unlikely(Cache == NULL || Plcy == NULL))
-      return false;
-
-   // Make sure there is at least one argument
-   if (NumPatterns < 1)
-      return _error->Error(_("You must give at least one search pattern"));
-   
-   // Compile the regex pattern
-   regex_t *Patterns = new regex_t[NumPatterns];
-   memset(Patterns,0,sizeof(*Patterns)*NumPatterns);
-   for (unsigned I = 0; I != NumPatterns; I++)
-   {
-      if (regcomp(&Patterns[I],CmdL.FileList[I+1],REG_EXTENDED | REG_ICASE | 
-		  REG_NOSUB) != 0)
-      {
-	 for (; I != 0; I--)
-	    regfree(&Patterns[I]);
-	 return _error->Error("Regex compilation error");
-      }      
-   }
-   
-   if (_error->PendingError() == true)
-   {
-      for (unsigned I = 0; I != NumPatterns; I++)
-	 regfree(&Patterns[I]);
-      return false;
-   }
-   
-   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)
-   {
-      size_t const PatternOffset = G->ID * NumPatterns;
-      size_t unmatched = 0, matched = 0;
-      for (unsigned I = 0; I < NumPatterns; ++I)
-      {
-	 if (PatternMatch[PatternOffset + I] == true)
-	    ++matched;
-	 else if (regexec(&Patterns[I],G.Name(),0,0,0) == 0)
-	    PatternMatch[PatternOffset + I] = true;
-	 else
-	    ++unmatched;
-      }
-
-      // already dealt with this package?
-      if (matched == NumPatterns)
-	 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)
-      {
-	 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].V = V;
-	 DFList[G->ID].ID = G->ID;
-      }
-
-      if (unmatched == NumPatterns)
-	 continue;
-
-      // Include all the packages that provide matching names too
-      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::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].V = V;
-	 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
-   for (ExDescFile *J = DFList; J->Df != 0; ++J)
-   {
-      pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(*Cache,J->Df));
-      size_t const PatternOffset = J->ID * NumPatterns;
-
-      if (NamesOnly == false)
-      {
-	 string const LongDesc = P.LongDesc();
-	 for (unsigned I = 0; I < NumPatterns; ++I)
-	 {
-	    if (PatternMatch[PatternOffset + I] == true)
-	       continue;
-	    else if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0)
-	       PatternMatch[PatternOffset + I] = 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)
-	    DisplayRecord(CacheFile, J->V);
-	 else
-	    printf("%s - %s\n",P.Name().c_str(),P.ShortDesc().c_str());
-      }
-   }
-   
-   delete [] DFList;
-   delete [] PatternMatch;
-   for (unsigned I = 0; I != NumPatterns; I++)
-      regfree(&Patterns[I]);
-   delete [] Patterns;
-   if (ferror(stdout))
-       return _error->Error("Write to stdout failed");
-   return true;
-}
-									/*}}}*/
 /* ShowAuto - show automatically installed packages (sorted)		{{{*/
 static bool ShowAuto(CommandLine &)
 {
@@ -1520,30 +978,6 @@ static bool ShowAuto(CommandLine &)
    return true;
 }
 									/*}}}*/
-// ShowPackage - Dump the package record to the screen			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowPackage(CommandLine &CmdL)
-{
-   pkgCacheFile CacheFile;
-   CacheSetHelperVirtuals helper(true, GlobalError::NOTICE);
-   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 (verset.empty() == true)
-   {
-      if (helper.virtualPkgs.empty() == true)
-        return _error->Error(_("No packages found"));
-      else
-        _error->Notice(_("No packages found"));
-   }
-   return true;
-}
-									/*}}}*/
 // ShowPkgNames - Show package names					/*{{{*/
 // ---------------------------------------------------------------------
 /* This does a prefix match on the first argument */
@@ -1580,195 +1014,6 @@ static bool ShowPkgNames(CommandLine &CmdL)
       cout << I.Name() << endl;
    }
    
-   return true;
-}
-									/*}}}*/
-// ShowSrcPackage - Show source package records				/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowSrcPackage(CommandLine &CmdL)
-{
-   pkgCacheFile CacheFile;
-   pkgSourceList *List = CacheFile.GetSourceList();
-   if (unlikely(List == NULL))
-      return false;
-
-   // Create the text record parsers
-   pkgSrcRecords SrcRecs(*List);
-   if (_error->PendingError() == true)
-      return false;
-
-   unsigned found = 0;
-   for (const char **I = CmdL.FileList + 1; *I != 0; I++)
-   {
-      SrcRecs.Restart();
-      
-      pkgSrcRecords::Parser *Parse;
-      unsigned found_this = 0;
-      while ((Parse = SrcRecs.Find(*I,false)) != 0) {
-         // SrcRecs.Find() will find both binary and source names
-         if (_config->FindB("APT::Cache::Only-Source", false) == true)
-            if (Parse->Package() != *I)
-               continue;
-        cout << Parse->AsStr() << endl;;
-        found++;
-        found_this++;
-      }
-      if (found_this == 0) {
-        _error->Warning(_("Unable to locate package %s"),*I);
-        continue;
-      }
-   }
-   if (found == 0)
-      _error->Notice(_("No packages found"));
-   return true;
-}
-									/*}}}*/
-// Policy - Show the results of the preferences file			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool Policy(CommandLine &CmdL)
-{
-   pkgCacheFile CacheFile;
-   pkgCache *Cache = CacheFile.GetPkgCache();
-   pkgPolicy *Plcy = CacheFile.GetPolicy();
-   pkgSourceList *SrcList = CacheFile.GetSourceList();
-   if (unlikely(Cache == NULL || Plcy == NULL || SrcList == NULL))
-      return false;
-
-   /* Should the MultiArchKiller be run to see which pseudo packages for an
-      arch all package are currently installed? Activating it gives a speed
-      penality for no real gain beside enhanced debugging, so in general no. */
-   if (_config->FindB("APT::Cache::Policy::DepCache", false) == true)
-      CacheFile.GetDepCache();
-
-   // Print out all of the package files
-   if (CmdL.FileList[1] == 0)
-   {
-      cout << _("Package files:") << endl;   
-      for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F.end() == false; ++F)
-      {
-	 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 &&
-	     _system->FindIndex(F,Indx) == false)
-	    return _error->Error(_("Cache is out of sync, can't x-ref a package file"));
-	 
-	 printf("%4i %s\n",
-		Plcy->GetPriority(F),Indx->Describe(true).c_str());
-	 
-	 // Print the reference information for the package
-	 string Str = F.RelStr();
-	 if (Str.empty() == false)
-	    printf("     release %s\n",F.RelStr().c_str());
-	 if (F.Site() != 0 && F.Site()[0] != 0)
-	    printf("     origin %s\n",F.Site());
-      }
-      
-      // Show any packages have explicit pins
-      cout << _("Pinned packages:") << endl;
-      pkgCache::PkgIterator I = Cache->PkgBegin();
-      for (;I.end() != true; ++I)
-      {
-	 // 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;
-	 }
-	 // New code
-	 for (pkgCache::VerIterator V = I.VersionList(); !V.end(); V++) {
-	    auto Prio = Plcy->GetPriority(V, false);
-	    if (Prio == 0)
-	       continue;
-
-	    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;
-   }
-
-   char const * const msgInstalled = _("  Installed: ");
-   char const * const msgCandidate = _("  Candidate: ");
-   short const InstalledLessCandidate =
-		mbstowcs(NULL, msgInstalled, 0) - mbstowcs(NULL, msgCandidate, 0);
-   short const deepInstalled =
-		(InstalledLessCandidate < 0 ? (InstalledLessCandidate*-1) : 0) - 1;
-   short const deepCandidate =
-		(InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1;
-
-   // Print out detailed information for each package
-   APT::CacheSetHelper helper(true, GlobalError::NOTICE);
-   APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1, helper);
-   for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
-   {
-      cout << Pkg.FullName(true) << ":" << endl;
-
-      // Installed version
-      cout << msgInstalled << OutputInDepth(deepInstalled, " ");
-      if (Pkg->CurrentVer == 0)
-	 cout << _("(none)") << endl;
-      else
-	 cout << Pkg.CurrentVer().VerStr() << endl;
-      
-      // Candidate Version 
-      cout << msgCandidate << OutputInDepth(deepCandidate, " ");
-      pkgCache::VerIterator V = Plcy->GetCandidateVer(Pkg);
-      if (V.end() == true)
-	 cout << _("(none)") << endl;
-      else
-	 cout << V.VerStr() << endl;
-
-      // Pinned version
-      if (_config->FindI("APT::Policy", 1) < 1 && Plcy->GetPriority(Pkg) != 0)
-      {
-	 cout << _("  Package pin: ");
-	 V = Plcy->GetMatch(Pkg);
-	 if (V.end() == true)
-	    cout << _("(not found)") << endl;
-	 else
-	    cout << V.VerStr() << endl;
-      }
-      
-      // Show the priority tables
-      cout << _("  Version table:") << endl;
-      for (V = Pkg.VersionList(); V.end() == false; ++V)
-      {
-	 if (Pkg.CurrentVer() == V)
-	    cout << " *** " << V.VerStr();
-	 else
-	    cout << "     " << V.VerStr();
-	 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;
-	    if (SrcList->FindIndex(VF.File(),Indx) == false &&
-		_system->FindIndex(VF.File(),Indx) == false)
-	       return _error->Error(_("Cache is out of sync, can't x-ref a package file"));
-	    printf("       %4i %s\n",Plcy->GetPriority(VF.File()),
-		   Indx->Describe(true).c_str());
-	 }
-      }
-   }
-   
    return true;
 }
 									/*}}}*/
@@ -1856,99 +1101,58 @@ static bool GenCaches(CommandLine &)
    return CacheFile.BuildCaches(&Progress, true);
 }
 									/*}}}*/
-// ShowHelp - Show a help screen					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &)					/*{{{*/
 {
-   ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
-
-   if (_config->FindB("version") == true)
-     return true;
-
-   cout << 
+   std::cout <<
     _("Usage: apt-cache [options] command\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 query information\n"
-      "from APT's binary cache files\n"
+      "       apt-cache [options] show pkg1 [pkg2 ...]\n"
       "\n"
-      "Commands:\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"
-      "   stats - Show some basic statistics\n"
-      "   dump - Show the entire file in a terse form\n"
-      "   dumpavail - Print an available file to stdout\n"
-      "   unmet - Show unmet dependencies\n"
-      "   search - Search the package list for a regex pattern\n"
-      "   show - Show a readable record for the package\n"
-      "   depends - Show raw dependency information for a package\n"
-      "   rdepends - Show reverse dependency information for a package\n"
-      "   pkgnames - List the names of all packages in the system\n"
-      "   dotty - Generate package graphs for GraphViz\n"
-      "   xvcg - Generate package graphs for xvcg\n"
-      "   policy - Show policy settings\n"
-      "\n"
-      "Options:\n"
-      "  -h   This help text.\n"
-      "  -p=? The package cache.\n"
-      "  -s=? The source cache.\n"
-      "  -q   Disable progress indicator.\n"
-      "  -i   Show only important deps for the unmet command.\n"
-      "  -c=? Read this configuration file\n"
-      "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-      "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n");
+      "apt-cache queries and displays available information about installed\n"
+      "and installable packages. It works exclusively on the data acquired\n"
+      "into the local cache via the 'update' command of e.g. apt-get. The\n"
+      "displayed information may therefore be outdated if the last update was\n"
+      "too long ago, but in exchange apt-cache works independently of the\n"
+      "availability of the configured sources (e.g. offline).\n");
    return true;
 }
 									/*}}}*/
+static std::vector<aptDispatchWithHelp> GetCommands()			/*{{{*/
+{
+   return {
+      {"gencaches",&GenCaches, nullptr},
+      {"showsrc",&ShowSrcPackage, _("Show source records")},
+      {"showpkg",&DumpPackage, nullptr},
+      {"stats",&Stats, nullptr},
+      {"dump",&Dump, nullptr},
+      {"dumpavail",&DumpAvail, nullptr},
+      {"unmet",&UnMet, nullptr},
+      {"search",&DoSearch, _("Search the package list for a regex pattern")},
+      {"depends",&Depends, _("Show raw dependency information for a package")},
+      {"rdepends",&RDepends, _("Show reverse dependency information for a package")},
+      {"dotty",&Dotty, nullptr},
+      {"xvcg",&XVcg, nullptr},
+      {"show",&ShowPackage, _("Show a readable record for the package")},
+      {"pkgnames",&ShowPkgNames, _("List the names of all packages in the system")},
+      {"showauto",&ShowAuto, nullptr},
+      {"policy",&Policy, _("Show policy settings")},
+      {"madison",&Madison, nullptr},
+      {nullptr, nullptr, nullptr}
+   };
+}
+									/*}}}*/
 int main(int argc,const char *argv[])					/*{{{*/
 {
-   CommandLine::Dispatch Cmds[] =  {{"help",&ShowHelp},
-                                    {"gencaches",&GenCaches},
-                                    {"showsrc",&ShowSrcPackage},
-                                    {"showpkg",&DumpPackage},
-                                    {"stats",&Stats},
-                                    {"dump",&Dump},
-                                    {"dumpavail",&DumpAvail},
-                                    {"unmet",&UnMet},
-                                    {"search",&Search},
-                                    {"depends",&Depends},
-                                    {"rdepends",&RDepends},
-                                    {"dotty",&Dotty},
-                                    {"xvcg",&XVcg},
-                                    {"show",&ShowPackage},
-                                    {"pkgnames",&ShowPkgNames},
-                                    {"showauto",&ShowAuto},
-                                    {"policy",&Policy},
-                                    {"madison",&Madison},
-                                    {0,0}};
-
-   std::vector<CommandLine::Args> Args = getCommandArgs("apt-cache", CommandLine::GetCommand(Cmds, argc, argv));
-
-   // Set up gettext support
-   setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
+   InitLocale();
 
    // Parse the command line and initialize the package library
    CommandLine CmdL;
-   ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CACHE, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 
    InitOutput();
 
    if (_config->Exists("APT::Cache::Generate") == true)
       _config->Set("pkgCacheFile::Generate", _config->FindB("APT::Cache::Generate", true));
 
-   // Match the operation
-   CmdL.DispatchArg(Cmds);
-
-   // Print any errors or warnings found during parsing
-   bool const Errors = _error->PendingError();
-   if (_config->FindI("quiet",0) > 0)
-      _error->DumpErrors();
-   else
-      _error->DumpErrors(GlobalError::DEBUG);
-   return Errors == true ? 100 : 0;
+   return DispatchCommandLine(CmdL, Cmds);
 }
 									/*}}}*/