Http download fixes

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 42ef548ec9a5e0d4eeec4db6e71274180aaec44f..da364e03c238f6ed673e8c2212b4df67ce216d72 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-get.cc,v 1.19 1998/11/24 02:35:32 jgg Exp $
+// $Id: apt-get.cc,v 1.43 1999/02/21 08:38:53 jgg Exp $

 /* ######################################################################
    
    apt-get - Cover for dpkg
 /* ######################################################################
    
    apt-get - Cover for dpkg


@@ -35,7 +35,8 @@
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/dpkgpm.h>
 #include <apt-pkg/dpkginit.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/dpkgpm.h>
 #include <apt-pkg/dpkginit.h>

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

 
 #include <config.h>
 
 
 #include <config.h>
 


@@ -44,7 +45,10 @@
 #include <fstream.h>
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <fstream.h>
 #include <termios.h>
 #include <sys/ioctl.h>

+#include <sys/stat.h>
+#include <sys/vfs.h>

 #include <signal.h>
 #include <signal.h>

+#include <unistd.h>

 #include <stdio.h>
                                                                        /*}}}*/
 
 #include <stdio.h>
                                                                        /*}}}*/
 


@@ -61,7 +65,7 @@ bool YnPrompt()
 {
    if (_config->FindB("APT::Get::Assume-Yes",false) == true)
    {
 {
    if (_config->FindB("APT::Get::Assume-Yes",false) == true)
    {

-      c2out << 'Y' << endl;
+      c1out << 'Y' << endl;

       return true;
    }
    
       return true;
    }
    


@@ -79,10 +83,10 @@ bool YnPrompt()
 // ---------------------------------------------------------------------
 /* This prints out a string of space seperated words with a title and 
    a two space indent line wraped to the current screen width. */
 // ---------------------------------------------------------------------
 /* This prints out a string of space seperated words with a title and 
    a two space indent line wraped to the current screen width. */

-void ShowList(ostream &out,string Title,string List)
+bool ShowList(ostream &out,string Title,string List)

 {
    if (List.empty() == true)
 {
    if (List.empty() == true)

-      return;
+      return true;

 
    // Acount for the leading space
    int ScreenWidth = ::ScreenWidth - 3;
 
    // Acount for the leading space
    int ScreenWidth = ::ScreenWidth - 3;


@@ -102,6 +106,7 @@ void ShowList(ostream &out,string Title,string List)
       out << "  " << string(List,Start,End - Start) << endl;
       Start = End + 1;
    }   
       out << "  " << string(List,Start,End - Start) << endl;
       Start = End + 1;
    }   

+   return false;

 }
                                                                        /*}}}*/
 // ShowBroken - Debugging aide                                         /*{{{*/
 }
                                                                        /*}}}*/
 // ShowBroken - Debugging aide                                         /*{{{*/


@@ -134,7 +139,7 @@ void ShowBroken(ostream &out,pkgDepCache &Cache)
         pkgCache::DepIterator Start;
         pkgCache::DepIterator End;
         D.GlobOr(Start,End);
         pkgCache::DepIterator Start;
         pkgCache::DepIterator End;
         D.GlobOr(Start,End);

-        
+

         if (Cache.IsImportantDep(End) == false || 
             (Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
            continue;
         if (Cache.IsImportantDep(End) == false || 
             (Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
            continue;


@@ -207,6 +212,7 @@ void ShowDel(ostream &out,pkgDepCache &Dep)
    for (;I.end() != true; I++)
       if (Dep[I].Delete() == true)
         List += string(I.Name()) + " ";
    for (;I.end() != true; I++)
       if (Dep[I].Delete() == true)
         List += string(I.Name()) + " ";

+   

    ShowList(out,"The following packages will be REMOVED:",List);
 }
                                                                        /*}}}*/
    ShowList(out,"The following packages will be REMOVED:",List);
 }
                                                                        /*}}}*/


@@ -250,7 +256,7 @@ void ShowUpgraded(ostream &out,pkgDepCache &Dep)
 // ShowHold - Show held but changed packages                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowHold - Show held but changed packages                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void ShowHold(ostream &out,pkgDepCache &Dep)
+bool ShowHold(ostream &out,pkgDepCache &Dep)

 {
    pkgCache::PkgIterator I = Dep.PkgBegin();
    string List;
 {
    pkgCache::PkgIterator I = Dep.PkgBegin();
    string List;


@@ -261,7 +267,7 @@ void ShowHold(ostream &out,pkgDepCache &Dep)
         List += string(I.Name()) + " ";
    }
 
         List += string(I.Name()) + " ";
    }
 

-   ShowList(out,"The following held packages will be changed:",List);
+   return ShowList(out,"The following held packages will be changed:",List);

 }
                                                                        /*}}}*/
 // ShowEssential - Show an essential package warning                   /*{{{*/
 }
                                                                        /*}}}*/
 // ShowEssential - Show an essential package warning                   /*{{{*/


@@ -269,7 +275,7 @@ void ShowHold(ostream &out,pkgDepCache &Dep)
 /* This prints out a warning message that is not to be ignored. It shows
    all essential packages and their dependents that are to be removed. 
    It is insanely risky to remove the dependents of an essential package! */
 /* This prints out a warning message that is not to be ignored. It shows
    all essential packages and their dependents that are to be removed. 
    It is insanely risky to remove the dependents of an essential package! */

-void ShowEssential(ostream &out,pkgDepCache &Dep)
+bool ShowEssential(ostream &out,pkgDepCache &Dep)

 {
    pkgCache::PkgIterator I = Dep.PkgBegin();
    string List;
 {
    pkgCache::PkgIterator I = Dep.PkgBegin();
    string List;


@@ -317,11 +323,10 @@ void ShowEssential(ostream &out,pkgDepCache &Dep)
       }      
    }
    
       }      
    }
    

+   delete [] Added;

    if (List.empty() == false)
       out << "WARNING: The following essential packages will be removed" << endl;
    if (List.empty() == false)
       out << "WARNING: The following essential packages will be removed" << endl;

-   ShowList(out,"This should NOT be done unless you know exactly what you are doing!",List);
-
-   delete [] Added;
+   return ShowList(out,"This should NOT be done unless you know exactly what you are doing!",List);

 }
                                                                        /*}}}*/
 // Stats - Show some statistics                                                /*{{{*/
 }
                                                                        /*}}}*/
 // Stats - Show some statistics                                                /*{{{*/


@@ -366,7 +371,7 @@ class CacheFile
    inline pkgDepCache *operator ->() {return Cache;};
    inline pkgDepCache &operator *() {return *Cache;};
    
    inline pkgDepCache *operator ->() {return Cache;};
    inline pkgDepCache &operator *() {return *Cache;};
    

-   bool Open();
+   bool Open(bool AllowBroken = false);

    CacheFile() : File(0), Map(0), Cache(0) {};
    ~CacheFile()
    {
    CacheFile() : File(0), Map(0), Cache(0) {};
    ~CacheFile()
    {


@@ -380,7 +385,7 @@ class CacheFile
 // ---------------------------------------------------------------------
 /* This routine generates the caches and then opens the dependency cache
    and verifies that the system is OK. */
 // ---------------------------------------------------------------------
 /* This routine generates the caches and then opens the dependency cache
    and verifies that the system is OK. */

-bool CacheFile::Open()
+bool CacheFile::Open(bool AllowBroken)

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


@@ -397,6 +402,8 @@ bool CacheFile::Open()
    pkgMakeStatusCache(List,Progress);
    if (_error->PendingError() == true)
       return _error->Error("The package lists or status file could not be parsed or opened.");
    pkgMakeStatusCache(List,Progress);
    if (_error->PendingError() == true)
       return _error->Error("The package lists or status file could not be parsed or opened.");

+   if (_error->empty() == false)
+      _error->Warning("You may want to run apt-get update to correct theses missing files");

    
    Progress.Done();
    
    
    Progress.Done();
    


@@ -424,7 +431,7 @@ bool CacheFile::Open()
       return false;
    
    // Nothing is broken
       return false;
    
    // Nothing is broken

-   if (Cache->BrokenCount() == 0)
+   if (Cache->BrokenCount() == 0 || AllowBroken == true)

       return true;
 
    // Attempt to fix broken things
       return true;
 
    // Attempt to fix broken things


@@ -461,15 +468,17 @@ bool CacheFile::Open()
    happen and then calls the download routines */
 bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
 {
    happen and then calls the download routines */
 bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
 {

+   bool Fail = false;
+   

    // Show all the various warning indicators
    ShowDel(c1out,Cache);
    ShowNew(c1out,Cache);
    if (ShwKept == true)
       ShowKept(c1out,Cache);
    // Show all the various warning indicators
    ShowDel(c1out,Cache);
    ShowNew(c1out,Cache);
    if (ShwKept == true)
       ShowKept(c1out,Cache);

-   ShowHold(c1out,Cache);
+   Fail |= !ShowHold(c1out,Cache);

    if (_config->FindB("APT::Get::Show-Upgraded",false) == true)
       ShowUpgraded(c1out,Cache);
    if (_config->FindB("APT::Get::Show-Upgraded",false) == true)
       ShowUpgraded(c1out,Cache);

-   ShowEssential(c1out,Cache);
+   Fail |= !ShowEssential(c1out,Cache);

    Stats(c1out,Cache);
    
    // Sanity check
    Stats(c1out,Cache);
    
    // Sanity check


@@ -481,7 +490,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
 
    if (Cache->DelCount() == 0 && Cache->InstCount() == 0 && 
        Cache->BadCount() == 0)
 
    if (Cache->DelCount() == 0 && Cache->InstCount() == 0 && 
        Cache->BadCount() == 0)

-      return true;   
+      return true;

 
    // Run the simulator ..
    if (_config->FindB("APT::Get::Simulate") == true)
 
    // Run the simulator ..
    if (_config->FindB("APT::Get::Simulate") == true)


@@ -492,7 +501,9 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
    
    // Create the text record parser
    pkgRecords Recs(Cache);
    
    // Create the text record parser
    pkgRecords Recs(Cache);

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

    // Lock the archive directory
    if (_config->FindB("Debug::NoLocking",false) == false)
    {
    // Lock the archive directory
    if (_config->FindB("Debug::NoLocking",false) == false)
    {


@@ -512,7 +523,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
    
    // Create the package manager and prepare to download
    pkgDPkgPM PM(Cache);
    
    // Create the package manager and prepare to download
    pkgDPkgPM PM(Cache);

-   if (PM.GetArchives(&Fetcher,&List,&Recs) == false)
+   if (PM.GetArchives(&Fetcher,&List,&Recs) == false || 
+       _error->PendingError() == true)

       return false;
 
    // Display statistics
       return false;
 
    // Display statistics


@@ -523,55 +535,101 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
       c0out << DebBytes << ',' << Cache->DebSize() << endl;
       c0out << "How odd.. The sizes didn't match, email apt@packages.debian.org" << endl;
    }
       c0out << DebBytes << ',' << Cache->DebSize() << endl;
       c0out << "How odd.. The sizes didn't match, email apt@packages.debian.org" << endl;
    }

-      
+
+   // Check for enough free space
+   struct statfs Buf;
+   string OutputDir = _config->FindDir("Dir::Cache::Archives");
+   if (statfs(OutputDir.c_str(),&Buf) != 0)
+      return _error->Errno("statfs","Couldn't determine free space in %s",
+                          OutputDir.c_str());
+   if (unsigned(Buf.f_bfree) < FetchBytes/Buf.f_bsize)
+      return _error->Error("Sorry, you don't have enough free space in %s",
+                          OutputDir.c_str());
+   

    // Number of bytes
    c1out << "Need to get ";
    if (DebBytes != FetchBytes)
    // Number of bytes
    c1out << "Need to get ";
    if (DebBytes != FetchBytes)

-      c1out << SizeToStr(FetchBytes) << '/' << SizeToStr(DebBytes);
+      c1out << SizeToStr(FetchBytes) << "b/" << SizeToStr(DebBytes) << 'b';

    else
    else

-      c1out << SizeToStr(DebBytes);
+      c1out << SizeToStr(DebBytes) << 'b';

       
    c1out << " of archives. After unpacking ";
    
    // Size delta
    if (Cache->UsrSize() >= 0)
       
    c1out << " of archives. After unpacking ";
    
    // Size delta
    if (Cache->UsrSize() >= 0)

-      c1out << SizeToStr(Cache->UsrSize()) << " will be used." << endl;
+      c1out << SizeToStr(Cache->UsrSize()) << "b will be used." << endl;

    else
    else

-      c1out << SizeToStr(-1*Cache->UsrSize()) << " will be freed." << endl;
+      c1out << SizeToStr(-1*Cache->UsrSize()) << "b will be freed." << endl;

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

+   // Fail safe check
+   if (_config->FindB("APT::Get::Assume-Yes",false) == true)
+   {
+      if (Fail == true && _config->FindB("APT::Get::Force-Yes",false) == false)
+        return _error->Error("There are problems and -y was used without --force-yes");
+   }         
+   

    // Prompt to continue
    if (Ask == true)
    // Prompt to continue
    if (Ask == true)

-   {      
-      if (_config->FindI("quiet",0) < 2 || 
+   {            
+      if (_config->FindI("quiet",0) < 2 ||

          _config->FindB("APT::Get::Assume-Yes",false) == false)
          _config->FindB("APT::Get::Assume-Yes",false) == false)

-      c2out << "Do you want to continue? [Y/n] " << flush;
+        c2out << "Do you want to continue? [Y/n] " << flush;
+

       if (YnPrompt() == false)
         exit(1);
    }      
 
       if (YnPrompt() == false)
         exit(1);
    }      
 

+   if (_config->FindB("APT::Get::Print-URIs") == true)
+   {
+      pkgAcquire::UriIterator I = Fetcher.UriBegin();
+      for (; I != Fetcher.UriEnd(); I++)
+        cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
+              I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl;
+      return true;
+   }
+   

    // Run it
    if (Fetcher.Run() == false)
       return false;
 
    // Print out errors
    bool Failed = false;
    // Run it
    if (Fetcher.Run() == false)
       return false;
 
    // Print out errors
    bool Failed = false;

+   bool Transient = false;

    for (pkgAcquire::Item **I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++)
    {
       if ((*I)->Status == pkgAcquire::Item::StatDone &&
          (*I)->Complete == true)
         continue;
       
    for (pkgAcquire::Item **I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++)
    {
       if ((*I)->Status == pkgAcquire::Item::StatDone &&
          (*I)->Complete == true)
         continue;
       

+      if ((*I)->Status == pkgAcquire::Item::StatIdle)
+      {
+        Transient = true;
+        Failed = true;
+        continue;
+      }
+      

       cerr << "Failed to fetch " << (*I)->Describe() << endl;
       cerr << "  " << (*I)->ErrorText << endl;
       Failed = true;
    }
       cerr << "Failed to fetch " << (*I)->Describe() << endl;
       cerr << "  " << (*I)->ErrorText << endl;
       Failed = true;
    }

+
+   if (_config->FindB("APT::Get::Download-Only",false) == true)
+      return true;

    
    

-   if (Failed == true && _config->FindB("APT::Fix-Missing",false) == false)
+   if (Failed == true && _config->FindB("APT::Get::Fix-Missing",false) == false)
+   {
+      if (Transient == true)
+      {
+        c2out << "Upgrading with disk swapping is not supported in this version." << endl;
+        c2out << "Try running multiple times with --fix-missing" << endl;
+      }
+      

       return _error->Error("Unable to fetch some archives, maybe try with --fix-missing?");
       return _error->Error("Unable to fetch some archives, maybe try with --fix-missing?");

-
+   }
+   

    // Try to deal with missing package files
    if (PM.FixMissing() == false)
    {
    // Try to deal with missing package files
    if (PM.FixMissing() == false)
    {


@@ -658,9 +716,14 @@ bool DoUpgrade(CommandLine &CmdL)
 bool DoInstall(CommandLine &CmdL)
 {
    CacheFile Cache;
 bool DoInstall(CommandLine &CmdL)
 {
    CacheFile Cache;

-   if (Cache.Open() == false)
+   if (Cache.Open(CmdL.FileSize() != 1) == false)

       return false;
    
       return false;
    

+   // Enter the special broken fixing mode if the user specified arguments
+   bool BrokenFix = false;
+   if (Cache->BrokenCount() != 0)
+      BrokenFix = true;
+   

    unsigned int ExpectedInst = 0;
    unsigned int Packages = 0;
    pkgProblemResolver Fix(Cache);
    unsigned int ExpectedInst = 0;
    unsigned int Packages = 0;
    pkgProblemResolver Fix(Cache);


@@ -723,11 +786,13 @@ bool DoInstall(CommandLine &CmdL)
               pkgCache::PkgIterator Pkg = I.OwnerPkg();
               
               if ((*Cache)[Pkg].CandidateVerIter(*Cache) == I.OwnerVer())
               pkgCache::PkgIterator Pkg = I.OwnerPkg();
               
               if ((*Cache)[Pkg].CandidateVerIter(*Cache) == I.OwnerVer())

-                 c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() << endl;
-
-              if ((*Cache)[Pkg].InstVerIter(*Cache) == I.OwnerVer())
-                 c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() <<
-                   " [Installed]"<< endl;
+              {
+                 if ((*Cache)[Pkg].Install() == true && (*Cache)[Pkg].NewInstall() == false)
+                    c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() <<
+                    " [Installed]"<< endl;
+                 else
+                    c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() << endl;
+              }      

            }
            c1out << "You should explicly select one to install." << endl;
         }
            }
            c1out << "You should explicly select one to install." << endl;
         }


@@ -767,10 +832,21 @@ bool DoInstall(CommandLine &CmdL)
         ExpectedInst++;
 
       // Install it with autoinstalling enabled.
         ExpectedInst++;
 
       // Install it with autoinstalling enabled.

-      if (State.InstBroken() == true)
+      if (State.InstBroken() == true && BrokenFix == false)

         Cache->MarkInstall(Pkg,true);
    }
 
         Cache->MarkInstall(Pkg,true);
    }
 

+   /* If we are in the Broken fixing mode we do not attempt to fix the
+      problems. This is if the user invoked install without -f and gave
+      packages */
+   if (BrokenFix == true && Cache->BrokenCount() != 0)
+   {
+      c1out << "You might want to run `apt-get -f install' to correct these." << endl;
+      ShowBroken(c1out,Cache);
+
+      return _error->Error("Unmet dependencies. Try using -f.");
+   }
+   

    // Call the scored problem resolver
    Fix.InstallProtect();
    if (Fix.Resolve(true) == false)
    // Call the scored problem resolver
    Fix.InstallProtect();
    if (Fix.Resolve(true) == false)


@@ -875,7 +951,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
       /* Install the package only if it is a new install, the autoupgrader
          will deal with the rest */
       if (I->SelectedState == pkgCache::State::Install)
       /* Install the package only if it is a new install, the autoupgrader
          will deal with the rest */
       if (I->SelectedState == pkgCache::State::Install)

-        Cache->MarkInstall(I);
+        Cache->MarkInstall(I,true);

    }
    
    // Apply erasures now, they override everything else.
    }
    
    // Apply erasures now, they override everything else.


@@ -887,12 +963,37 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
         Cache->MarkDelete(I);
    }
 
         Cache->MarkDelete(I);
    }
 

-   /* Use updates smart upgrade to do the rest, it will automatically
-      ignore held items */
+   /* Resolve any problems that dselect created, allupgrade cannot handle
+      such things. We do so quite agressively too.. */
+   if (Cache->BrokenCount() != 0)
+   {      
+      pkgProblemResolver Fix(Cache);
+
+      // Hold back held packages.
+      if (_config->FindB("APT::Ingore-Hold",false) == false)
+      {
+        for (pkgCache::PkgIterator I = Cache->PkgBegin(); I.end() == false; I++)
+        {
+           if (I->SelectedState == pkgCache::State::Hold)
+           {
+              Fix.Protect(I);
+              Cache->MarkKeep(I);
+           }
+        }
+      }
+   
+      if (Fix.Resolve() == false)
+      {
+        ShowBroken(c1out,Cache);
+        return _error->Error("Internal Error, problem resolver broke stuff");
+      }
+   }
+
+   // Now upgrade everything

    if (pkgAllUpgrade(Cache) == false)
    {
       ShowBroken(c1out,Cache);
    if (pkgAllUpgrade(Cache) == false)
    {
       ShowBroken(c1out,Cache);

-      return _error->Error("Internal Error, AllUpgrade broke stuff");
+      return _error->Error("Internal Error, problem resolver broke stuff");

    }
    
    return InstallPackages(Cache,false);
    }
    
    return InstallPackages(Cache,false);


@@ -909,6 +1010,31 @@ bool DoClean(CommandLine &CmdL)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+// DoAutoClean - Smartly remove downloaded archives                    /*{{{*/
+// ---------------------------------------------------------------------
+/* This is similar to clean but it only purges things that cannot be 
+   downloaded, that is old versions of cached packages. */
+class LogCleaner : public pkgArchiveCleaner
+{
+   protected:
+   virtual void Erase(const char *File,string Pkg,string Ver,struct stat &St) 
+   {
+      cout << "Del " << Pkg << " " << Ver << " [" << SizeToStr(St.st_size) << "b]" << endl;
+   };
+};
+
+bool DoAutoClean(CommandLine &CmdL)
+{
+   CacheFile Cache;
+   if (Cache.Open(true) == false)
+      return false;
+   
+   LogCleaner Cleaner;
+   
+   return Cleaner.Go(_config->FindDir("Dir::Cache::archives"),*Cache) &&
+      Cleaner.Go(_config->FindDir("Dir::Cache::archives") + "partial/",*Cache);
+}
+                                                                       /*}}}*/

 // DoCheck - Perform the check operation                               /*{{{*/
 // ---------------------------------------------------------------------
 /* Opening automatically checks the system, this command is mostly used
 // DoCheck - Perform the check operation                               /*{{{*/
 // ---------------------------------------------------------------------
 /* Opening automatically checks the system, this command is mostly used


@@ -925,11 +1051,13 @@ bool DoCheck(CommandLine &CmdL)
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

 {
    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-get [options] command" << endl;
    cout << "       apt-get [options] install pkg1 [pkg2 ...]" << endl;
    cout << endl;
    cout << "Usage: apt-get [options] command" << endl;
    cout << "       apt-get [options] install pkg1 [pkg2 ...]" << endl;
    cout << endl;


@@ -945,6 +1073,7 @@ int ShowHelp()
    cout << "   dist-upgrade - Distribution upgrade, see apt-get(8)" << endl;
    cout << "   dselect-upgrade - Follow dselect selections" << endl;
    cout << "   clean - Erase downloaded archive files" << endl;
    cout << "   dist-upgrade - Distribution upgrade, see apt-get(8)" << endl;
    cout << "   dselect-upgrade - Follow dselect selections" << endl;
    cout << "   clean - Erase downloaded archive files" << endl;

+   cout << "   autoclean - Erase old downloaded archive files" << endl;

    cout << "   check - Verify that there are no broken dependencies" << endl;
    cout << endl;
    cout << "Options:" << endl;
    cout << "   check - Verify that there are no broken dependencies" << endl;
    cout << endl;
    cout << "Options:" << endl;


@@ -959,7 +1088,7 @@ int ShowHelp()
    cout << "  -u  Show a list of upgraded packages as well" << endl;
    cout << "  -c=? Read this configuration file" << endl;
    cout << "  -o=? Set an arbitary configuration option, ie -o dir::cache=/tmp" << endl;
    cout << "  -u  Show a list of upgraded packages as well" << 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-get(8), sources.list(8) and apt.conf(8) manual" << endl;
+   cout << "See the apt-get(8), sources.list(5) and apt.conf(5) manual" << endl;

    cout << "pages for more information." << endl;
    return 100;
 }
    cout << "pages for more information." << endl;
    return 100;
 }


@@ -975,6 +1104,7 @@ void GetInitialize()
    _config->Set("APT::Get::Simulate",false);
    _config->Set("APT::Get::Assume-Yes",false);
    _config->Set("APT::Get::Fix-Broken",false);
    _config->Set("APT::Get::Simulate",false);
    _config->Set("APT::Get::Assume-Yes",false);
    _config->Set("APT::Get::Fix-Broken",false);

+   _config->Set("APT::Get::Force-Yes",false);

 }
                                                                        /*}}}*/
 // SigWinch - Window size change signal handler                                /*{{{*/
 }
                                                                        /*}}}*/
 // SigWinch - Window size change signal handler                                /*{{{*/


@@ -996,6 +1126,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},

       {'q',"quiet","quiet",CommandLine::IntLevel},
       {'q',"silent","quiet",CommandLine::IntLevel},
       {'d',"download-only","APT::Get::Download-Only",0},
       {'q',"quiet","quiet",CommandLine::IntLevel},
       {'q',"silent","quiet",CommandLine::IntLevel},
       {'d',"download-only","APT::Get::Download-Only",0},


@@ -1010,10 +1141,23 @@ int main(int argc,const char *argv[])
       {'m',"ignore-missing","APT::Get::Fix-Missing",0},
       {0,"fix-missing","APT::Get::Fix-Missing",0},
       {0,"ignore-hold","APT::Ingore-Hold",0},      
       {'m',"ignore-missing","APT::Get::Fix-Missing",0},
       {0,"fix-missing","APT::Get::Fix-Missing",0},
       {0,"ignore-hold","APT::Ingore-Hold",0},      

-      {0,"no-upgrade","APT::Get::no-upgrade",0},      
+      {0,"no-upgrade","APT::Get::no-upgrade",0},
+      {0,"force-yes","APT::Get::force-yes",0},
+      {0,"print-uris","APT::Get::Print-URIs",0},

       {'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 Cmds[] = {{"update",&DoUpdate},
+                                   {"upgrade",&DoUpgrade},
+                                   {"install",&DoInstall},
+                                   {"remove",&DoInstall},
+                                   {"dist-upgrade",&DoDistUpgrade},
+                                   {"dselect-upgrade",&DoDSelectUpgrade},
+                                   {"clean",&DoClean},
+                                   {"autoclean",&DoAutoClean},
+                                   {"check",&DoCheck},
+                                  {"help",&ShowHelp},
+                                   {0,0}};

    
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
    
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);


@@ -1026,8 +1170,9 @@ int main(int argc,const char *argv[])
 
    // See if the help should be shown
    if (_config->FindB("help") == true ||
 
    // See if the help should be shown
    if (_config->FindB("help") == true ||

+       _config->FindB("version") == true ||

        CmdL.FileSize() == 0)
        CmdL.FileSize() == 0)

-      return ShowHelp();
+      return ShowHelp(CmdL);

 
    // Setup the output streams
    c0out.rdbuf(cout.rdbuf());
 
    // Setup the output streams
    c0out.rdbuf(cout.rdbuf());


@@ -1044,41 +1189,13 @@ int main(int argc,const char *argv[])
    SigWinch(0);
    
    // Match the operation
    SigWinch(0);
    
    // Match the operation

-   struct 
-   {
-      const char *Match;
-      bool (*Handler)(CommandLine &);
-   } Map[] = {{"update",&DoUpdate},
-              {"upgrade",&DoUpgrade},
-              {"install",&DoInstall},
-              {"remove",&DoInstall},
-              {"dist-upgrade",&DoDistUpgrade},
-              {"dselect-upgrade",&DoDSelectUpgrade},
-              {"clean",&DoClean},
-              {"check",&DoCheck},
-              {0,0}};
-   int I;
-   for (I = 0; Map[I].Match != 0; I++)
-   {
-      if (strcmp(CmdL.FileList[0],Map[I].Match) == 0)
-      {
-        if (Map[I].Handler(CmdL) == false && _error->PendingError() == false)
-           _error->Error("Handler silently failed");
-        break;
-      }
-   }
-      
-   // No matching name
-   if (Map[I].Match == 0)
-      _error->Error("Invalid operation %s", CmdL.FileList[0]);
+   CmdL.DispatchArg(Cmds);

 
    // Print any errors or warnings found during parsing
    if (_error->empty() == false)
    {
       bool Errors = _error->PendingError();
       _error->DumpErrors();
 
    // Print any errors or warnings found during parsing
    if (_error->empty() == false)
    {
       bool Errors = _error->PendingError();
       _error->DumpErrors();

-      if (Errors == true)
-        cout << "Returning 100." << endl;

       return Errors == true?100:0;
    }
    
       return Errors == true?100:0;
    }