Minor fixes

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

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 4d0a076a870465d8d8ef10819f577bb3a7f1b562..cf1240bc6b422e181fe9039a9431b987d69e3175 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,23 +1,14 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-cache.cc,v 1.6 1998/07/26 23:11:56 jgg Exp $
+// $Id: apt-cache.cc,v 1.23 1999/01/30 02:12:53 jgg Exp $

 /* ######################################################################
    
 /* ######################################################################
    

-   apt-cache - Manages the cache file.
+   apt-cache - Manages the cache files

    
    

-   This program should eventually handle both low and high level
-   manipulation of the cache file. Depending how far things go it 
-   might get quite a sophisticated UI.
-   
-   Currently the command line is as follows:
-      apt-cache add cache file1:dist:ver file2:dist:ver ...
-    ie:
-      apt-cache add ./cache Pacakges:hamm:1.0
-
-   A usefull feature is 'upgradable' ie
-      apt-cache upgradable ./cache
-   will list .debs that should be installed to make all packages the latest
-   version.
+   apt-cache provides some functions fo manipulating the cache files.
+   It uses the command line interface common to all the APT tools. The
+   only really usefull function right now is dumpavail which is used
+   by the dselect method. Everything else is ment as a debug aide.

    
    Returns 100 on failure, 0 on success.
    
    
    Returns 100 on failure, 0 on success.
    


@@ -30,61 +21,132 @@
 #include <apt-pkg/init.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>

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

 
 #include <iostream.h>
 
 #include <iostream.h>

-#include <fstream.h>
-
+#include <config.h>

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

-string CacheFile;
+pkgCache *GCache = 0;

 
 

-// SplitArg - Split the triple                                         /*{{{*/
+// UnMet - Show unmet dependencies                                     /*{{{*/

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

-bool SplitArg(const char *Arg,string &File,string &Dist,string Ver)
+bool UnMet(CommandLine &CmdL)

 {
 {

-   const char *Start = Arg;
-   const char *I = Arg;
-   for (;*I != 0 && *I != ':'; I++);
-   if (*I != ':')
-      return _error->Error("Malformed argument %s, must be in file:dist:rev form",Arg);
-   File = string(Start,I - Start);
-
-   I++;
-   Start = I;
-   for (;*I != 0 && *I != ':'; I++);
-   if (*I != ':')
-      return _error->Error("Malformed argument %s, must be in file:dist:rev form",Arg);
-   Dist = string(Start,I - Start);
+   pkgCache &Cache = *GCache;
+   bool Important = _config->FindB("APT::Cache::Important",false);

    
    

-   I++;
-   Start = I;
-   for (;*I != 0 && *I != ':'; I++);
-   if (I == Start)
-      return _error->Error("Malformed argument %s, must be in file:dist:rev form",Arg);
-   Ver = string(Start,I - Start);
+   for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
+   {
+      for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++)
+      {
+        bool Header = false;
+        for (pkgCache::DepIterator D = V.DependsList(); D.end() == false;)
+        {
+           // Collect or groups
+           pkgCache::DepIterator Start;
+           pkgCache::DepIterator End;
+           D.GlobOr(Start,End);
+           
+/*         cout << "s: Check " << Start.TargetPkg().Name() << ',' <<
+              End.TargetPkg().Name() << endl;*/
+              
+           // Skip conflicts and replaces
+           if (End->Type != pkgCache::Dep::PreDepends &&
+               End->Type != pkgCache::Dep::Depends && 
+               End->Type != pkgCache::Dep::Suggests &&
+               End->Type != pkgCache::Dep::Recommends)
+              continue;

 
 

+           // Important deps only
+           if (Important == true)
+              if (End->Type != pkgCache::Dep::PreDepends &&
+                  End->Type != pkgCache::Dep::Depends)
+                 continue;
+           
+           // Verify the or group
+           bool OK = false;
+           pkgCache::DepIterator RealStart = Start;
+           do
+           {
+              // See if this dep is Ok
+              pkgCache::Version **VList = Start.AllTargets();
+              if (*VList != 0)
+              {
+                 OK = true;
+                 delete [] VList;
+                 break;
+              }
+              delete [] VList;
+              
+              if (Start == End)
+                 break;
+              Start++;
+           }
+           while (1);
+
+           // The group is OK
+           if (OK == true)
+              continue;
+           
+           // Oops, it failed..
+           if (Header == false)
+                 cout << "Package " << P.Name() << " version " << 
+              V.VerStr() << " has an unmet dep:" << endl;
+           Header = true;
+           
+           // Print out the dep type
+           cout << " " << End.DepType() << ": ";
+
+           // Show the group
+           Start = RealStart;
+           do
+           {
+              cout << Start.TargetPkg().Name();
+              if (Start.TargetVer() != 0)
+                 cout << " (" << Start.CompType() << " " << Start.TargetVer() <<
+                 ")";
+              if (Start == End)
+                 break;
+              cout << " | ";
+              Start++;
+           }
+           while (1);
+           
+           cout << endl;
+        }       
+      }
+   }   

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

-bool DumpPackage(pkgCache &Cache,int argc,char *argv[])
+bool DumpPackage(CommandLine &CmdL)

 {   
 {   

-   for (int I = 0; I != argc; I++)
+   pkgCache &Cache = *GCache;
+   for (const char **I = CmdL.FileList + 1; *I != 0; I++)

    {
    {

-      pkgCache::PkgIterator Pkg = Cache.FindPkg(argv[I]);
+      pkgCache::PkgIterator Pkg = Cache.FindPkg(*I);

       if (Pkg.end() == true)
       {
       if (Pkg.end() == true)
       {

-        _error->Warning("Unable to locate package %s",argv[0]);
+        _error->Warning("Unable to locate package %s",*I);

         continue;
       }
 
       cout << "Package: " << Pkg.Name() << endl;
       cout << "Versions: ";
       for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++)
         continue;
       }
 
       cout << "Package: " << Pkg.Name() << endl;
       cout << "Versions: ";
       for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++)

-        cout << Cur.VerStr() << ',';
+      {
+        cout << Cur.VerStr();
+        for (pkgCache::VerFileIterator Vf = Cur.FileList(); Vf.end() == false; Vf++)
+           cout << "(" << Vf.File().FileName() << ")";
+        cout << ',';
+      }
+      

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


@@ -112,6 +174,7 @@ bool DumpPackage(pkgCache &Cache,int argc,char *argv[])
       for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); Prv.end() != true; Prv++)
         cout << Prv.OwnerPkg().Name() << " " << Prv.OwnerVer().VerStr();
       cout << endl;
       for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); Prv.end() != true; Prv++)
         cout << Prv.OwnerPkg().Name() << " " << Prv.OwnerVer().VerStr();
       cout << endl;

+            

    }
 
    return true;
    }
 
    return true;


@@ -120,9 +183,11 @@ bool DumpPackage(pkgCache &Cache,int argc,char *argv[])
 // Stats - Dump some nice statistics                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Stats - Dump some nice statistics                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool Stats(pkgCache &Cache)
+bool Stats(CommandLine &Cmd)

 {
 {

-   cout << "Total Package Names : " << Cache.Head().PackageCount << endl;
+   pkgCache &Cache = *GCache;
+   cout << "Total Package Names : " << Cache.Head().PackageCount << " (" <<
+      SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl;

    pkgCache::PkgIterator I = Cache.PkgBegin();
    
    int Normal = 0;
    pkgCache::PkgIterator I = Cache.PkgBegin();
    
    int Normal = 0;


@@ -167,16 +232,71 @@ bool Stats(pkgCache &Cache)
    cout << "  Mixed Virtual Packages: " << NVirt << endl;
    cout << "  Missing: " << Missing << endl;
    
    cout << "  Mixed Virtual Packages: " << NVirt << endl;
    cout << "  Missing: " << Missing << endl;
    

-   cout << "Total Distinct Versions: " << Cache.Head().VersionCount << endl;
-   cout << "Total Dependencies: " << Cache.Head().DependsCount << endl;
+   cout << "Total Distinct Versions: " << Cache.Head().VersionCount << " (" <<
+      SizeToStr(Cache.Head().VersionCount*Cache.Head().VersionSz) << ')' << endl;
+   cout << "Total Dependencies: " << Cache.Head().DependsCount << " (" << 
+      SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl;
+   
+   cout << "Total Ver/File relations: " << Cache.Head().VerFileCount << " (" <<
+      SizeToStr(Cache.Head().VerFileCount*Cache.Head().VerFileSz) << ')' << endl;
+   cout << "Total Provides Mappings: " << Cache.Head().ProvidesCount << " (" <<
+      SizeToStr(Cache.Head().ProvidesCount*Cache.Head().ProvidesSz) << ')' << endl;
+   
+   // String list stats
+   unsigned long Size = 0;
+   unsigned long Count = 0;
+   for (pkgCache::StringItem *I = Cache.StringItemP + Cache.Head().StringList;
+        I!= Cache.StringItemP; I = Cache.StringItemP + I->NextItem)
+   {
+      Count++;
+      Size += strlen(Cache.StrP + I->String);
+   }
+   cout << "Total Globbed Strings: " << Count << " (" << SizeToStr(Size) << ')' << 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;
+   Total = Slack + Size + Cache.Head().DependsCount*Cache.Head().DependencySz + 
+           Cache.Head().VersionCount*Cache.Head().VersionSz +
+           Cache.Head().PackageCount*Cache.Head().PackageSz + 
+           Cache.Head().VerFileCount*Cache.Head().VerFileSz +
+           Cache.Head().ProvidesCount*Cache.Head().ProvidesSz;
+   cout << "Total Space Accounted for: " << SizeToStr(Total) << endl;
+   
+   return true;
+}
+                                                                       /*}}}*/
+// Check - Check some things about the cache                           /*{{{*/
+// ---------------------------------------------------------------------
+/* Debug aide mostly */
+bool Check(CommandLine &Cmd)
+{
+   pkgCache &Cache = *GCache;
+   pkgCache::PkgIterator Pkg = Cache.PkgBegin();
+   for (;Pkg.end() != true; Pkg++)
+   {
+      if (Pkg.Section() == 0 && Pkg->VersionList != 0)
+        cout << "Bad section " << Pkg.Name() << endl;
+      
+      for (pkgCache::VerIterator Cur = Pkg.VersionList(); 
+          Cur.end() != true; Cur++)
+      {
+        if (Cur->Priority < 1 || Cur->Priority > 5)
+           cout << "Bad prio " << Pkg.Name() << ',' << Cur.VerStr() << " == " << (int)Cur->Priority << endl;
+      }
+   }

    return true;
 }
                                                                        /*}}}*/
 // Dump - show everything                                              /*{{{*/
 // ---------------------------------------------------------------------
 /* */
    return true;
 }
                                                                        /*}}}*/
 // Dump - show everything                                              /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
 {

+   pkgCache &Cache = *GCache;

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


@@ -195,7 +315,13 @@ bool Dump(pkgCache &Cache)
       cout << " Size: " << F->Size << endl;
       cout << " ID: " << F->ID << endl;
       cout << " Flags: " << F->Flags << endl;
       cout << " Size: " << F->Size << endl;
       cout << " ID: " << F->ID << endl;
       cout << " Flags: " << F->Flags << endl;

-      cout << " Time: " << ctime(&F->mtime) << endl;
+      cout << " Time: " << TimeRFC1123(F->mtime) << endl;
+      cout << " Archive: " << F.Archive() << endl;
+      cout << " Component: " << F.Component() << endl;
+      cout << " Version: " << F.Version() << endl;
+      cout << " Origin: " << F.Origin() << endl;
+      cout << " Label: " << F.Label() << endl;
+      cout << " Architecture: " << F.Architecture() << endl;

    }
 
    return true;
    }
 
    return true;


@@ -204,8 +330,9 @@ bool Dump(pkgCache &Cache)
 // DumpAvail - Print out the available list                            /*{{{*/
 // ---------------------------------------------------------------------
 /* This is needed to make dpkg --merge happy */
 // DumpAvail - Print out the available list                            /*{{{*/
 // ---------------------------------------------------------------------
 /* This is needed to make dpkg --merge happy */

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

 {
 {

+   pkgCache &Cache = *GCache;

    unsigned char *Buffer = new unsigned char[Cache.HeaderP->MaxVerFileSize];
 
    for (pkgCache::PkgFileIterator I = Cache.FileBegin(); I.end() == false; I++)
    unsigned char *Buffer = new unsigned char[Cache.HeaderP->MaxVerFileSize];
 
    for (pkgCache::PkgFileIterator I = Cache.FileBegin(); I.end() == false; I++)


@@ -255,14 +382,14 @@ bool DumpAvail(pkgCache &Cache)
 // DoAdd - Perform an adding operation                                 /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // DoAdd - Perform an adding operation                                 /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool DoAdd(int argc,char *argv[])
+bool DoAdd(CommandLine &CmdL)

 {
 {

-   string FileName;
-   string Dist;
-   string Ver;
+   // 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
    
    // Open the cache

-   FileFd CacheF(CacheFile,FileFd::WriteEmpty);
+   FileFd CacheF(_config->FindFile("Dir::Cache::pkgcache"),FileFd::WriteAny);

    if (_error->PendingError() == true)
       return false;
    
    if (_error->PendingError() == true)
       return false;
    


@@ -270,24 +397,24 @@ bool DoAdd(int argc,char *argv[])
    if (_error->PendingError() == true)
       return false;
 
    if (_error->PendingError() == true)
       return false;
 

-   OpTextProgress Progress;
+   OpTextProgress Progress(*_config);

    pkgCacheGenerator Gen(Map,Progress);
    if (_error->PendingError() == true)
       return false;
 
    pkgCacheGenerator Gen(Map,Progress);
    if (_error->PendingError() == true)
       return false;
 

-   for (int I = 0; I != argc; I++)
+   unsigned long Length = CmdL.FileSize() - 1;
+   for (const char **I = CmdL.FileList + 1; *I != 0; I++)

    {
    {

-      Progress.OverallProgress(I,argc,1,"Generating cache");
-      if (SplitArg(argv[I],FileName,Dist,Ver) == false)
-        return false;
-      
+      Progress.OverallProgress(I - CmdL.FileList,Length,1,"Generating cache");
+      Progress.SubProgress(Length);
+

       // Do the merge
       // Do the merge

-      FileFd TagF(FileName.c_str(),FileFd::ReadOnly);
+      FileFd TagF(*I,FileFd::ReadOnly);

       debListParser Parser(TagF);
       if (_error->PendingError() == true)
       debListParser Parser(TagF);
       if (_error->PendingError() == true)

-        return _error->Error("Problem opening %s",FileName.c_str());
+        return _error->Error("Problem opening %s",*I);

       
       

-      if (Gen.SelectFile(FileName) == false)
+      if (Gen.SelectFile(*I) == false)

         return _error->Error("Problem with SelectFile");
         
       if (Gen.MergeList(Parser) == false)
         return _error->Error("Problem with SelectFile");
         
       if (Gen.MergeList(Parser) == false)


@@ -295,7 +422,8 @@ bool DoAdd(int argc,char *argv[])
    }
 
    Progress.Done();
    }
 
    Progress.Done();

-   Stats(Gen.GetCache());
+   GCache = &Gen.GetCache();
+   Stats(CmdL);

    
    return true;
 }
    
    return true;
 }


@@ -303,87 +431,125 @@ bool DoAdd(int argc,char *argv[])
 // GenCaches - Call the main cache generator                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // GenCaches - Call the main cache generator                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
 {

-   OpTextProgress Progress;
+   OpTextProgress Progress(*_config);
+   

    pkgSourceList List;
    List.ReadMainList();
    pkgSourceList List;
    List.ReadMainList();

-   return pkgMakeStatusCache(List,Progress);  
+   return pkgMakeStatusCache(List,Progress);
+}
+                                                                       /*}}}*/
+// ShowHelp - Show a help screen                                       /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool ShowHelp(CommandLine &Cmd)
+{
+   cout << PACKAGE << ' ' << VERSION << " for " << ARCHITECTURE <<
+       " compiled on " << __DATE__ << "  " << __TIME__ << endl;
+   if (_config->FindB("version") == true)
+      return 100;
+   
+   cout << "Usage: apt-cache [options] command" << endl;
+   cout << "       apt-cache [options] add file1 [file1 ...]" << endl;
+   cout << "       apt-cache [options] showpkg pkg1 [pkg2 ...]" << endl;
+   cout << endl;
+   cout << "apt-cache is a low-level tool used to manipulate APT's binary" << endl;
+   cout << "cache files stored in " << _config->FindFile("Dir::Cache") << endl;
+   cout << "It is not ment for ordinary use only as a debug aide." << endl;
+   cout << endl;
+   cout << "Commands:" << endl;
+   cout << "   add - Add an package file to the source cache" << endl;
+   cout << "   gencaches - Build both the package and source cache" << endl;
+   cout << "   showpkg - Show some general information for a single package" << endl;
+   cout << "   stats - Show some basic statistics" << endl;
+   cout << "   dump - Show the entire file in a terse form" << endl;
+   cout << "   dumpavail - Print an available file to stdout" << endl;
+   cout << "   unmet - Show unmet dependencies" << endl;
+   cout << "   check - Check the cache a bit" << endl;
+   cout << endl;
+   cout << "Options:" << endl;
+   cout << "  -h   This help text." << endl;
+   cout << "  -p=? The package cache. [" << _config->FindFile("Dir::Cache::pkgcache") << ']' << endl;
+   cout << "  -s=? The source cache. [" << _config->FindFile("Dir::Cache::srcpkgcache") << ']' << endl;
+   cout << "  -q   Disable progress indicator." << endl;
+   cout << "  -i   Show only important deps for the unmet command." << endl;
+   cout << "  -c=? Read this configuration file" << endl;
+   cout << "  -o=? Set an arbitary configuration option, ie -o dir::cache=/tmp" << endl;
+   cout << "See the apt-cache(8) and apt.conf(5) manual pages for more information." << endl;
+   return 100;
+}
+                                                                       /*}}}*/
+// CacheInitialize - Initialize things for apt-cache                   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void CacheInitialize()
+{
+   _config->Set("quiet",0);
+   _config->Set("help",false);

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

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

 {
 {

-   // Check arguments.
-   if (argc < 3)
+   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},
+      {'c',"config-file",0,CommandLine::ConfigFile},
+      {'o',"option",0,CommandLine::ArbItem},
+      {0,0,0,0}};
+   CommandLine::Dispatch CmdsA[] = {{"help",&ShowHelp},
+                                    {"add",&DoAdd},
+                                    {"gencaches",&GenCaches},
+                                    {0,0}};
+   CommandLine::Dispatch CmdsB[] = {{"showpkg",&DumpPackage},
+                                    {"stats",&Stats},
+                                    {"dump",&Dump},
+                                    {"dumpavail",&DumpAvail},
+                                    {"unmet",&UnMet},
+                                    {"check",&Check},
+                                    {0,0}};
+
+   CacheInitialize();
+   
+   // Parse the command line and initialize the package library
+   CommandLine CmdL(Args,_config);
+   if (pkgInitialize(*_config) == false ||
+       CmdL.Parse(argc,argv) == false)

    {
    {

-      cerr << "Usage is apt-cache add cache file1:dist:ver file2:dist:ver ..." << endl;
+      _error->DumpErrors();

       return 100;
    }
 
       return 100;
    }
 

-   pkgInitialize(*_config);
-   while (1)
-   {
-      CacheFile = argv[2];
-      if (strcmp(argv[1],"add") == 0)
-      {
-        DoAdd(argc - 3,argv + 3);
-        break;
-      }
-
-      if (strcmp(argv[1],"gencaches") == 0)
-      {
-        GenCaches();
-        break;
-      }
+   // See if the help should be shown
+   if (_config->FindB("help") == true ||
+       CmdL.FileSize() == 0)
+      return ShowHelp(CmdL);

 
 

+   if (CmdL.DispatchArg(CmdsA,false) == false && _error->PendingError() == false)
+   {      

       // Open the cache file
       // Open the cache file

-      FileFd CacheF(CacheFile,FileFd::ReadOnly);
-      if (_error->PendingError() == true)
-        break;
-      
+      FileFd CacheF(_config->FindFile("Dir::Cache::pkgcache"),FileFd::ReadOnly);

       MMap Map(CacheF,MMap::Public | MMap::ReadOnly);
       MMap Map(CacheF,MMap::Public | MMap::ReadOnly);

-      if (_error->PendingError() == true)
-        break;
-      
-      pkgCache Cache(Map);   
-      if (_error->PendingError() == true)
-        break;
-    
-      if (strcmp(argv[1],"showpkg") == 0)
-      {
-        CacheFile = argv[2];
-        DumpPackage(Cache,argc - 3,argv + 3);
-        break;
-      }
-
-      if (strcmp(argv[1],"stats") == 0)
+      if (_error->PendingError() == false)

       {
       {

-        Stats(Cache);
-        break;
-      }
-      
-      if (strcmp(argv[1],"dump") == 0)
-      {
-        Dump(Cache);
-        break;
-      }
-      
-      if (strcmp(argv[1],"dumpavail") == 0)
-      {
-        DumpAvail(Cache);
-        break;
-      }
-            
-      _error->Error("Invalid operation %s", argv[1]);
-      break;
+        pkgCache Cache(Map);   
+        GCache = &Cache;
+        if (_error->PendingError() == false)
+           CmdL.DispatchArg(CmdsB);
+      }      

    }
    
    // Print any errors or warnings found during parsing
    if (_error->empty() == false)
    {
    }
    
    // Print any errors or warnings found during parsing
    if (_error->empty() == false)
    {

+      bool Errors = _error->PendingError();

       _error->DumpErrors();
       _error->DumpErrors();

-      return 100;
+      return Errors == true?100:0;

    }
           
    return 0;
    }
           
    return 0;