Fixed another oops

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

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

-// $Id: apt-cache.cc,v 1.17 1998/12/10 04:22:48 jgg Exp $
+// $Id: apt-cache.cc,v 1.23 1999/01/30 02:12:53 jgg Exp $

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


@@ -22,17 +22,20 @@
 #include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/cmndline.h>

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

 
 #include <iostream.h>
 #include <config.h>
                                                                        /*}}}*/
 
 
 #include <iostream.h>
 #include <config.h>
                                                                        /*}}}*/
 

+pkgCache *GCache = 0;
+

 // UnMet - Show unmet dependencies                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // UnMet - Show unmet dependencies                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool UnMet(pkgCache &Cache)
+bool UnMet(CommandLine &CmdL)

 {
 {

+   pkgCache &Cache = *GCache;

    bool Important = _config->FindB("APT::Cache::Important",false);
    
    for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
    bool Important = _config->FindB("APT::Cache::Important",false);
    
    for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)


@@ -122,8 +125,9 @@ bool UnMet(pkgCache &Cache)
 // DumpPackage - Show a dump of a package record                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // DumpPackage - Show a dump of a package record                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool DumpPackage(pkgCache &Cache,CommandLine &CmdL)
+bool DumpPackage(CommandLine &CmdL)

 {   
 {   

+   pkgCache &Cache = *GCache;

    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
       pkgCache::PkgIterator Pkg = Cache.FindPkg(*I);
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
       pkgCache::PkgIterator Pkg = Cache.FindPkg(*I);


@@ -179,8 +183,9 @@ bool DumpPackage(pkgCache &Cache,CommandLine &CmdL)
 // Stats - Dump some nice statistics                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Stats - Dump some nice statistics                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
 {

+   pkgCache &Cache = *GCache;

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


@@ -232,8 +237,10 @@ bool Stats(pkgCache &Cache)
    cout << "Total Dependencies: " << Cache.Head().DependsCount << " (" << 
       SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl;
    
    cout << "Total Dependencies: " << Cache.Head().DependsCount << " (" << 
       SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl;
    

-   cout << "Total Ver/File relations: " << Cache.Head().PackageCount << " (" <<
-      SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << 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;
    
    // String list stats
    unsigned long Size = 0;


@@ -254,7 +261,9 @@ bool Stats(pkgCache &Cache)
    unsigned long Total = 0;
    Total = Slack + Size + Cache.Head().DependsCount*Cache.Head().DependencySz + 
            Cache.Head().VersionCount*Cache.Head().VersionSz +
    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().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;
    cout << "Total Space Accounted for: " << SizeToStr(Total) << endl;
    
    return true;


@@ -263,8 +272,9 @@ bool Stats(pkgCache &Cache)
 // Check - Check some things about the cache                           /*{{{*/
 // ---------------------------------------------------------------------
 /* Debug aide mostly */
 // Check - Check some things about the cache                           /*{{{*/
 // ---------------------------------------------------------------------
 /* Debug aide mostly */

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

 {
 {

+   pkgCache &Cache = *GCache;

    pkgCache::PkgIterator Pkg = Cache.PkgBegin();
    for (;Pkg.end() != true; Pkg++)
    {
    pkgCache::PkgIterator Pkg = Cache.PkgBegin();
    for (;Pkg.end() != true; Pkg++)
    {


@@ -284,8 +294,9 @@ bool Check(pkgCache &Cache)
 // Dump - show everything                                              /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // 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;


@@ -304,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;


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


@@ -404,7 +422,8 @@ bool DoAdd(CommandLine &CmdL)
    }
 
    Progress.Done();
    }
 
    Progress.Done();

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

    
    return true;
 }
    
    return true;
 }


@@ -412,7 +431,7 @@ bool DoAdd(CommandLine &CmdL)
 // GenCaches - Call the main cache generator                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // GenCaches - Call the main cache generator                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

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


@@ -424,10 +443,12 @@ bool GenCaches()
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
    cout << PACKAGE << ' ' << VERSION << " for " << ARCHITECTURE <<
        " compiled on " << __DATE__ << "  " << __TIME__ << endl;
 {
    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 << "Usage: apt-cache [options] command" << endl;
    cout << "       apt-cache [options] add file1 [file1 ...]" << endl;


@@ -451,10 +472,11 @@ int ShowHelp()
    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 << "  -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 << "  -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 << "  -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(8) manual pages for more information." << endl;
+   cout << "See the apt-cache(8) and apt.conf(5) manual pages for more information." << endl;

    return 100;
 }
                                                                        /*}}}*/
    return 100;
 }
                                                                        /*}}}*/


@@ -472,6 +494,7 @@ int main(int argc,const char *argv[])
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
 {
    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},
       {'p',"pkg-cache","Dir::Cache::pkgcache",CommandLine::HasArg},
       {'s',"src-cache","Dir::Cache::srcpkgcache",CommandLine::HasArg},
       {'q',"quiet","quiet",CommandLine::IntLevel},


@@ -479,6 +502,17 @@ int main(int argc,const char *argv[])
       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
       {0,0,0,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();
    
 
    CacheInitialize();
    


@@ -494,79 +528,20 @@ int main(int argc,const char *argv[])
    // See if the help should be shown
    if (_config->FindB("help") == true ||
        CmdL.FileSize() == 0)
    // See if the help should be shown
    if (_config->FindB("help") == true ||
        CmdL.FileSize() == 0)

-      return ShowHelp();
-   
-   while (1)
-   {
-      if (strcmp(CmdL.FileList[0],"add") == 0)
-      {
-        ShowHelp();
-        break;
-      }
-      
-      if (strcmp(CmdL.FileList[0],"add") == 0)
-      {
-        DoAdd(CmdL);
-        break;
-      }
-
-      if (strcmp(CmdL.FileList[0],"gencaches") == 0)
-      {
-        GenCaches();
-        break;
-      }
+      return ShowHelp(CmdL);

 
 

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

       // Open the cache file
       FileFd CacheF(_config->FindFile("Dir::Cache::pkgcache"),FileFd::ReadOnly);
       // Open the cache file
       FileFd CacheF(_config->FindFile("Dir::Cache::pkgcache"),FileFd::ReadOnly);

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

       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(CmdL.FileList[0],"showpkg") == 0)
+      if (_error->PendingError() == false)

       {
       {

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

    }
    
    // Print any errors or warnings found during parsing
    }
    
    // Print any errors or warnings found during parsing