]> git.saurik.com Git - apt-legacy.git/commitdiff
Removed a number of evil timestamps from builds.
authorJay Freeman (saurik) <saurik@saurik.com>
Tue, 17 Jun 2008 22:20:22 +0000 (22:20 +0000)
committerJay Freeman (saurik) <saurik@saurik.com>
Tue, 17 Jun 2008 22:20:22 +0000 (22:20 +0000)
A timestamp.diff

git-svn-id: http://svn.telesphoreo.org/trunk@323 514c082c-b64e-11dc-b46d-3d985efe055d

14 files changed:
cmdline/apt-cache.cc
cmdline/apt-cache.cc.orig
cmdline/apt-cdrom.cc
cmdline/apt-cdrom.cc.orig
cmdline/apt-config.cc
cmdline/apt-config.cc.orig
cmdline/apt-extracttemplates.cc
cmdline/apt-extracttemplates.cc.orig
cmdline/apt-get.cc
cmdline/apt-get.cc.orig
cmdline/apt-sortpkgs.cc
cmdline/apt-sortpkgs.cc.orig
ftparchive/apt-ftparchive.cc
ftparchive/apt-ftparchive.cc.orig [new file with mode: 0644]

index 07c82c90c1e08f933f91c1cba43e05a3ae2c21c6..363148ec350391c4581314a2168eac9cec58df1c 100644 (file)
@@ -1653,8 +1653,8 @@ bool GenCaches(CommandLine &Cmd)
 /* */
 bool ShowHelp(CommandLine &Cmd)
 {
-   ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+   ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION,
+           COMMON_OS,COMMON_CPU);
    
    if (_config->FindB("version") == true)
      return true;
index d01c0c37c1580730cfcc0798f71e308742c2d8d1..07c82c90c1e08f933f91c1cba43e05a3ae2c21c6 100644 (file)
@@ -1761,7 +1761,7 @@ int main(int argc,const char *argv[])
 
    // Set up gettext support
    setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
+   //textdomain(PACKAGE);
 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
index 677df810e70b6e3f474af77858a7b798de9e5b74..67c27d53e74fddb3fe554eeba60c04904ee3ff28 100644 (file)
@@ -139,8 +139,8 @@ bool DoIdent(CommandLine &)
 /* */
 int ShowHelp()
 {
-   ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+   ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION,
+           COMMON_OS,COMMON_CPU);
    if (_config->FindB("version") == true)
       return 0;
    
index 6a1be2cf0f4038e9a1d0b81e54355aefbb4c8975..677df810e70b6e3f474af77858a7b798de9e5b74 100644 (file)
@@ -201,7 +201,7 @@ int main(int argc,const char *argv[])
 
    // Set up gettext support
    setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
+   //textdomain(PACKAGE);
 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
index f154cd881065098a980fabf0182e4ae89f824bbe..2a231081f8beb0cf49a7852df3402a484c40ab64 100644 (file)
@@ -71,8 +71,8 @@ bool DoDump(CommandLine &CmdL)
 /* */
 int ShowHelp()
 {
-   ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+   ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION,
+           COMMON_OS,COMMON_CPU);
    if (_config->FindB("version") == true)
       return 0;
    
index 978356932b7937195d5acecc51c4fe3308456c52..f154cd881065098a980fabf0182e4ae89f824bbe 100644 (file)
@@ -116,7 +116,7 @@ int main(int argc,const char *argv[])
 
    // Set up gettext support
    setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
+   //textdomain(PACKAGE);
 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
index b1dbd95ea09c8b98bf571ce5486342b706d13784..dca5f8997dbadecb6063f4bf84b2b6bbf831f984 100644 (file)
@@ -226,8 +226,8 @@ bool DebFile::ParseInfo()
 /* */
 int ShowHelp(void)
 {
-       ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+       ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION,
+           COMMON_OS,COMMON_CPU);
 
        if (_config->FindB("version") == true) 
                return 0;
index 5061ddd4a238e54a4b8e60730bc6684009349582..b1dbd95ea09c8b98bf571ce5486342b706d13784 100644 (file)
@@ -374,7 +374,7 @@ int main(int argc, const char **argv)
 
        // Set up gettext support
        setlocale(LC_ALL,"");
-       textdomain(PACKAGE);
+       //textdomain(PACKAGE);
 
        // Parse the command line and initialize the package library
        CommandLine CmdL(Args,_config);
index 04791b5786f882f375dce477694bc46164b3024f..5c93e52926b1b4df1aa99c80f76d5b98bd79d12c 100644 (file)
@@ -2389,8 +2389,8 @@ bool DoMoo(CommandLine &CmdL)
 /* */
 bool ShowHelp(CommandLine &CmdL)
 {
-   ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+   ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION,
+           COMMON_OS,COMMON_CPU);
            
    if (_config->FindB("version") == true)
    {
index d3bca63a667d8915b2a9959926634bbf760d3423..04791b5786f882f375dce477694bc46164b3024f 100644 (file)
@@ -66,12 +66,13 @@ extern "C" {
 #include <sys/wait.h>
                                                                        /*}}}*/
 
+#define _trace() printf("_trace(%s:%d)\n", __FILE__, __LINE__)
+
 using namespace std;
 
 ostream c0out(0);
 ostream c1out(0);
 ostream c2out(0);
-ofstream devnull("/dev/null");
 unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */
 
 // class CacheFile - Cover class for some dependency cache functions   /*{{{*/
@@ -2573,7 +2574,7 @@ int main(int argc,const char *argv[])
 
    // Set up gettext support
    setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
+   //textdomain(PACKAGE);
 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
@@ -2601,6 +2602,9 @@ int main(int argc,const char *argv[])
    if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
       _config->Set("quiet","1");
 
+   ofstream devnull;
+   devnull.open("/dev/null");
+
    // Setup the output streams
    c0out.rdbuf(cout.rdbuf());
    c1out.rdbuf(cout.rdbuf());
index bec90aeaf3e58771ff95504f73aa0efcbbb6ecb3..8624bd744c8c0161e0d44699158aebc17979c651 100644 (file)
@@ -145,8 +145,8 @@ bool DoIt(string InFile)
 /* */
 int ShowHelp()
 {
-   ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+   ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION,
+           COMMON_OS,COMMON_CPU);
    if (_config->FindB("version") == true)
       return 0;
    
index 08fe77aeb9942fddbcb44e84afd1a996d4724763..bec90aeaf3e58771ff95504f73aa0efcbbb6ecb3 100644 (file)
@@ -187,7 +187,7 @@ int main(unsigned int argc,const char *argv[])
 
    // Set up gettext support
    setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
+   //textdomain(PACKAGE);
 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
index 4afc2ea6cf952b55bb628e43e798a7a3ca7cca35..36139cf68a071523ed188fbf85fa034ae8996173 100644 (file)
@@ -551,8 +551,8 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
 /* */
 bool ShowHelp(CommandLine &CmdL)
 {
-   ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+   ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION,
+           COMMON_OS,COMMON_CPU);
    if (_config->FindB("version") == true)
       return true;
 
diff --git a/ftparchive/apt-ftparchive.cc.orig b/ftparchive/apt-ftparchive.cc.orig
new file mode 100644 (file)
index 0000000..4afc2ea
--- /dev/null
@@ -0,0 +1,977 @@
+extern "C" {
+    #include <mach-o/nlist.h>
+}
+
+// -*- mode: cpp; mode: fold -*-
+// Description                                                         /*{{{*/
+// $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $
+/* ######################################################################
+
+   apt-scanpackages - Efficient work-alike for dpkg-scanpackages
+
+   Let contents be disabled from the conf
+   
+   ##################################################################### */
+                                                                       /*}}}*/
+// Include Files                                                       /*{{{*/
+#ifdef __GNUG__
+#pragma implementation "apt-ftparchive.h"
+#endif
+
+#include "apt-ftparchive.h"
+    
+#include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/strutl.h>
+#include <config.h>
+#include <apti18n.h>
+#include <algorithm>
+
+#include <sys/time.h>
+#include <regex.h>
+
+#include "contents.h"
+#include "multicompress.h"
+#include "writer.h"    
+                                                                       /*}}}*/
+
+using namespace std;    
+ostream c0out(0);
+ostream c1out(0);
+ostream c2out(0);
+ofstream devnull("/dev/null");
+unsigned Quiet = 0;
+
+// struct PackageMap - List of all package files in the config file    /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+struct PackageMap
+{
+   // General Stuff
+   string BaseDir;
+   string InternalPrefix;
+   string FLFile;
+   string PkgExt;
+   string SrcExt;
+   
+   // Stuff for the Package File
+   string PkgFile;
+   string BinCacheDB;
+   string BinOverride;
+   string ExtraOverride;
+
+   // We generate for this given arch
+   string Arch;
+   
+   // Stuff for the Source File
+   string SrcFile;
+   string SrcOverride;
+   string SrcExtraOverride;
+
+   // Contents 
+   string Contents;
+   string ContentsHead;
+   
+   // Random things
+   string Tag;
+   string PkgCompress;
+   string CntCompress;
+   string SrcCompress;
+   string PathPrefix;
+   unsigned int DeLinkLimit;
+   mode_t Permissions;
+   
+   bool ContentsDone;
+   bool PkgDone;
+   bool SrcDone;
+   time_t ContentsMTime;
+   
+   struct ContentsCompare : public binary_function<PackageMap,PackageMap,bool>
+   {
+      inline bool operator() (const PackageMap &x,const PackageMap &y)
+      {return x.ContentsMTime < y.ContentsMTime;};
+   };
+    
+   struct DBCompare : public binary_function<PackageMap,PackageMap,bool>
+   {
+      inline bool operator() (const PackageMap &x,const PackageMap &y)
+      {return x.BinCacheDB < y.BinCacheDB;};
+   };  
+   
+   void GetGeneral(Configuration &Setup,Configuration &Block);
+   bool GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats);
+   bool GenSources(Configuration &Setup,struct CacheDB::Stats &Stats);
+   bool GenContents(Configuration &Setup,
+                   vector<PackageMap>::iterator Begin,
+                   vector<PackageMap>::iterator End,
+                   unsigned long &Left);
+   
+   PackageMap() : DeLinkLimit(0), Permissions(1), ContentsDone(false), 
+        PkgDone(false), SrcDone(false), ContentsMTime(0) {};
+};
+                                                                       /*}}}*/
+
+// PackageMap::GetGeneral - Common per-section definitions             /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void PackageMap::GetGeneral(Configuration &Setup,Configuration &Block)
+{
+   PathPrefix = Block.Find("PathPrefix");
+   
+   if (Block.FindB("External-Links",true) == false)
+      DeLinkLimit = Setup.FindI("Default::DeLinkLimit",UINT_MAX);
+   else
+      DeLinkLimit = 0;
+   
+   PkgCompress = Block.Find("Packages::Compress",
+                           Setup.Find("Default::Packages::Compress",". gzip").c_str());
+   CntCompress = Block.Find("Contents::Compress",
+                           Setup.Find("Default::Contents::Compress",". gzip").c_str());
+   SrcCompress = Block.Find("Sources::Compress",
+                           Setup.Find("Default::Sources::Compress",". gzip").c_str());
+   
+   SrcExt = Block.Find("Sources::Extensions",
+                      Setup.Find("Default::Sources::Extensions",".dsc").c_str());
+   PkgExt = Block.Find("Packages::Extensions",
+                      Setup.Find("Default::Packages::Extensions",".deb").c_str());
+   
+   Permissions = Setup.FindI("Default::FileMode",0644);
+   
+   if (FLFile.empty() == false)
+      FLFile = flCombine(Setup.Find("Dir::FileListDir"),FLFile);
+   
+   if (Contents == " ")
+      Contents= string();   
+}
+                                                                       /*}}}*/
+// PackageMap::GenPackages - Actually generate a Package file          /*{{{*/
+// ---------------------------------------------------------------------
+/* This generates the Package File described by this object. */
+bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats)
+{   
+   if (PkgFile.empty() == true)
+      return true;
+   
+   string ArchiveDir = Setup.FindDir("Dir::ArchiveDir");
+   string OverrideDir = Setup.FindDir("Dir::OverrideDir");
+   string CacheDir = Setup.FindDir("Dir::CacheDir");
+
+   struct timeval StartTime;
+   gettimeofday(&StartTime,0);   
+   
+   PkgDone = true;
+   
+   // Create a package writer object.
+   PackagesWriter Packages(flCombine(CacheDir,BinCacheDB),
+                          flCombine(OverrideDir,BinOverride),
+                          flCombine(OverrideDir,ExtraOverride),
+                          Arch);
+   if (PkgExt.empty() == false && Packages.SetExts(PkgExt) == false)
+      return _error->Error(_("Package extension list is too long"));
+   if (_error->PendingError() == true)
+      return _error->Error(_("Error processing directory %s"),BaseDir.c_str());
+   
+   Packages.PathPrefix = PathPrefix;
+   Packages.DirStrip = ArchiveDir;
+   Packages.InternalPrefix = flCombine(ArchiveDir,InternalPrefix);
+
+   Packages.Stats.DeLinkBytes = Stats.DeLinkBytes;
+   Packages.DeLinkLimit = DeLinkLimit;
+
+   // Create a compressor object
+   MultiCompress Comp(flCombine(ArchiveDir,PkgFile),
+                     PkgCompress,Permissions);
+   Packages.Output = Comp.Input;
+   if (_error->PendingError() == true)
+      return _error->Error(_("Error processing directory %s"),BaseDir.c_str());
+   
+   c0out << ' ' << BaseDir << ":" << flush;
+   
+   // Do recursive directory searching
+   if (FLFile.empty() == true)
+   {
+      if (Packages.RecursiveScan(flCombine(ArchiveDir,BaseDir)) == false)
+        return false;
+   }
+   else
+   {
+      if (Packages.LoadFileList(ArchiveDir,FLFile) == false)
+        return false;
+   }
+   
+   Packages.Output = 0;      // Just in case
+   
+   // Finish compressing
+   unsigned long Size;
+   if (Comp.Finalize(Size) == false)
+   {
+      c0out << endl;
+      return _error->Error(_("Error processing directory %s"),BaseDir.c_str());
+   }
+   
+   if (Size != 0)
+      c0out << " New "
+             << SizeToStr(Size) << "B ";
+   else
+      c0out << ' ';
+   
+   struct timeval NewTime;
+   gettimeofday(&NewTime,0);
+   double Delta = NewTime.tv_sec - StartTime.tv_sec + 
+                  (NewTime.tv_usec - StartTime.tv_usec)/1000000.0;
+   
+   c0out << Packages.Stats.Packages << " files " <<
+/*      SizeToStr(Packages.Stats.MD5Bytes) << "B/" << */
+      SizeToStr(Packages.Stats.Bytes) << "B " <<
+      TimeToStr((long)Delta) << endl;
+   
+   Stats.Add(Packages.Stats);
+   Stats.DeLinkBytes = Packages.Stats.DeLinkBytes;
+   
+   return !_error->PendingError();
+}
+
+                                                                       /*}}}*/
+// PackageMap::GenSources - Actually generate a Source file            /*{{{*/
+// ---------------------------------------------------------------------
+/* This generates the Sources File described by this object. */
+bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats)
+{   
+   if (SrcFile.empty() == true)
+      return true;
+   
+   string ArchiveDir = Setup.FindDir("Dir::ArchiveDir");
+   string OverrideDir = Setup.FindDir("Dir::OverrideDir");
+   string CacheDir = Setup.FindDir("Dir::CacheDir");
+
+   struct timeval StartTime;
+   gettimeofday(&StartTime,0);   
+   
+   SrcDone = true;
+   
+   // Create a package writer object.
+   SourcesWriter Sources(flCombine(OverrideDir,BinOverride),
+                        flCombine(OverrideDir,SrcOverride),
+                        flCombine(OverrideDir,SrcExtraOverride));
+   if (SrcExt.empty() == false && Sources.SetExts(SrcExt) == false)
+      return _error->Error(_("Source extension list is too long"));
+   if (_error->PendingError() == true)
+      return _error->Error(_("Error processing directory %s"),BaseDir.c_str());
+   
+   Sources.PathPrefix = PathPrefix;
+   Sources.DirStrip = ArchiveDir;
+   Sources.InternalPrefix = flCombine(ArchiveDir,InternalPrefix);
+
+   Sources.DeLinkLimit = DeLinkLimit;
+   Sources.Stats.DeLinkBytes = Stats.DeLinkBytes;
+   
+   // Create a compressor object
+   MultiCompress Comp(flCombine(ArchiveDir,SrcFile),
+                     SrcCompress,Permissions);
+   Sources.Output = Comp.Input;
+   if (_error->PendingError() == true)
+      return _error->Error(_("Error processing directory %s"),BaseDir.c_str());
+
+   c0out << ' ' << BaseDir << ":" << flush;
+   
+   // Do recursive directory searching
+   if (FLFile.empty() == true)
+   {
+      if (Sources.RecursiveScan(flCombine(ArchiveDir,BaseDir))== false)
+        return false;
+   }   
+   else
+   {
+      if (Sources.LoadFileList(ArchiveDir,FLFile) == false)
+        return false;
+   }
+   Sources.Output = 0;      // Just in case
+   
+   // Finish compressing
+   unsigned long Size;
+   if (Comp.Finalize(Size) == false)
+   {
+      c0out << endl;
+      return _error->Error(_("Error processing directory %s"),BaseDir.c_str());
+   }
+      
+   if (Size != 0)
+      c0out << " New "
+             << SizeToStr(Size) << "B ";
+   else
+      c0out << ' ';
+   
+   struct timeval NewTime;
+   gettimeofday(&NewTime,0);
+   double Delta = NewTime.tv_sec - StartTime.tv_sec +
+                  (NewTime.tv_usec - StartTime.tv_usec)/1000000.0;
+   
+   c0out << Sources.Stats.Packages << " pkgs in " <<
+      TimeToStr((long)Delta) << endl;
+
+   Stats.Add(Sources.Stats);
+   Stats.DeLinkBytes = Sources.Stats.DeLinkBytes;
+   
+   return !_error->PendingError();
+}
+                                                                       /*}}}*/
+// PackageMap::GenContents - Actually generate a Contents file         /*{{{*/
+// ---------------------------------------------------------------------
+/* This generates the contents file partially described by this object.
+   It searches the given iterator range for other package files that map
+   into this contents file and includes their data as well when building. */
+bool PackageMap::GenContents(Configuration &Setup,
+                            vector<PackageMap>::iterator Begin,
+                            vector<PackageMap>::iterator End,
+                            unsigned long &Left)
+{
+   if (Contents.empty() == true)
+      return true;
+   
+   if (Left == 0)
+      return true;
+   
+   string ArchiveDir = Setup.FindDir("Dir::ArchiveDir");
+   string CacheDir = Setup.FindDir("Dir::CacheDir");
+   string OverrideDir = Setup.FindDir("Dir::OverrideDir");
+   
+   struct timeval StartTime;
+   gettimeofday(&StartTime,0);   
+   
+   // Create a package writer object.
+   ContentsWriter Contents("");
+   if (PkgExt.empty() == false && Contents.SetExts(PkgExt) == false)
+      return _error->Error(_("Package extension list is too long"));
+   if (_error->PendingError() == true)
+      return false;
+
+   MultiCompress Comp(flCombine(ArchiveDir,this->Contents),
+                     CntCompress,Permissions);
+   Comp.UpdateMTime = Setup.FindI("Default::ContentsAge",10)*24*60*60;
+   Contents.Output = Comp.Input;
+   if (_error->PendingError() == true)
+      return false;
+
+   // Write the header out.
+   if (ContentsHead.empty() == false)
+   {
+      FileFd Head(flCombine(OverrideDir,ContentsHead),FileFd::ReadOnly);
+      if (_error->PendingError() == true)
+        return false;
+      
+      unsigned long Size = Head.Size();
+      unsigned char Buf[4096];
+      while (Size != 0)
+      {
+        unsigned long ToRead = Size;
+        if (Size > sizeof(Buf))
+           ToRead = sizeof(Buf);
+        
+        if (Head.Read(Buf,ToRead) == false)
+           return false;
+        
+        if (fwrite(Buf,1,ToRead,Comp.Input) != ToRead)
+           return _error->Errno("fwrite",_("Error writing header to contents file"));
+        
+        Size -= ToRead;
+      }            
+   }  
+      
+   /* Go over all the package file records and parse all the package
+      files associated with this contents file into one great big honking
+      memory structure, then dump the sorted version */
+   c0out << ' ' << this->Contents << ":" << flush;
+   for (vector<PackageMap>::iterator I = Begin; I != End; I++)
+   {
+      if (I->Contents != this->Contents)
+        continue;
+      
+      Contents.Prefix = ArchiveDir;
+      Contents.ReadyDB(flCombine(CacheDir,I->BinCacheDB));
+      Contents.ReadFromPkgs(flCombine(ArchiveDir,I->PkgFile),
+                           I->PkgCompress);
+      
+      I->ContentsDone = true;      
+   }
+   
+   Contents.Finish();
+   
+   // Finish compressing
+   unsigned long Size;
+   if (Comp.Finalize(Size) == false || _error->PendingError() == true)
+   {
+      c0out << endl;
+      return _error->Error(_("Error processing contents %s"),
+                          this->Contents.c_str());
+   }
+   
+   if (Size != 0)
+   {
+      c0out << " New " << SizeToStr(Size) << "B ";
+      if (Left > Size)
+        Left -= Size;
+      else
+        Left = 0;
+   }
+   else
+      c0out << ' ';
+   
+   struct timeval NewTime;
+   gettimeofday(&NewTime,0);   
+   double Delta = NewTime.tv_sec - StartTime.tv_sec + 
+                  (NewTime.tv_usec - StartTime.tv_usec)/1000000.0;
+   
+   c0out << Contents.Stats.Packages << " files " <<
+      SizeToStr(Contents.Stats.Bytes) << "B " <<
+      TimeToStr((long)Delta) << endl;
+   
+   return true;
+}
+                                                                       /*}}}*/
+
+// LoadTree - Load a 'tree' section from the Generate Config           /*{{{*/
+// ---------------------------------------------------------------------
+/* This populates the PkgList with all the possible permutations of the
+   section/arch lists. */
+void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup)
+{   
+   // Load the defaults
+   string DDir = Setup.Find("TreeDefault::Directory",
+                           "$(DIST)/$(SECTION)/binary-$(ARCH)/");
+   string DSDir = Setup.Find("TreeDefault::SrcDirectory",
+                           "$(DIST)/$(SECTION)/source/");
+   string DPkg = Setup.Find("TreeDefault::Packages",
+                           "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages");
+   string DIPrfx = Setup.Find("TreeDefault::InternalPrefix",
+                           "$(DIST)/$(SECTION)/");
+   string DContents = Setup.Find("TreeDefault::Contents",
+                           "$(DIST)/Contents-$(ARCH)");
+   string DContentsH = Setup.Find("TreeDefault::Contents::Header","");
+   string DBCache = Setup.Find("TreeDefault::BinCacheDB",
+                              "packages-$(ARCH).db");
+   string DSources = Setup.Find("TreeDefault::Sources",
+                               "$(DIST)/$(SECTION)/source/Sources");
+   string DFLFile = Setup.Find("TreeDefault::FileList", "");
+   string DSFLFile = Setup.Find("TreeDefault::SourceFileList", "");
+
+   // Process 'tree' type sections
+   const Configuration::Item *Top = Setup.Tree("tree");
+   for (Top = (Top == 0?0:Top->Child); Top != 0;)
+   {
+      Configuration Block(Top);
+      string Dist = Top->Tag;
+
+      // Parse the sections
+      string Tmp = Block.Find("Sections");
+      const char *Sections = Tmp.c_str();
+      string Section;
+      while (ParseQuoteWord(Sections,Section) == true)
+      {
+        string Tmp2 = Block.Find("Architectures");
+        string Arch;
+        const char *Archs = Tmp2.c_str();
+        while (ParseQuoteWord(Archs,Arch) == true)
+        {
+           struct SubstVar Vars[] = {{"$(DIST)",&Dist},
+                                     {"$(SECTION)",&Section},
+                                     {"$(ARCH)",&Arch},
+                                     {}};
+           PackageMap Itm;
+           
+           Itm.BinOverride = SubstVar(Block.Find("BinOverride"),Vars);
+           Itm.InternalPrefix = SubstVar(Block.Find("InternalPrefix",DIPrfx.c_str()),Vars);
+
+           if (stringcasecmp(Arch,"source") == 0)
+           {
+              Itm.SrcOverride = SubstVar(Block.Find("SrcOverride"),Vars);
+              Itm.BaseDir = SubstVar(Block.Find("SrcDirectory",DSDir.c_str()),Vars);
+              Itm.SrcFile = SubstVar(Block.Find("Sources",DSources.c_str()),Vars);
+              Itm.Tag = SubstVar("$(DIST)/$(SECTION)/source",Vars);
+              Itm.FLFile = SubstVar(Block.Find("SourceFileList",DSFLFile.c_str()),Vars);
+              Itm.SrcExtraOverride = SubstVar(Block.Find("SrcExtraOverride"),Vars);
+           }
+           else
+           {
+              Itm.BinCacheDB = SubstVar(Block.Find("BinCacheDB",DBCache.c_str()),Vars);
+              Itm.BaseDir = SubstVar(Block.Find("Directory",DDir.c_str()),Vars);
+              Itm.PkgFile = SubstVar(Block.Find("Packages",DPkg.c_str()),Vars);
+              Itm.Tag = SubstVar("$(DIST)/$(SECTION)/$(ARCH)",Vars);
+              Itm.Arch = Arch;
+              Itm.Contents = SubstVar(Block.Find("Contents",DContents.c_str()),Vars);
+              Itm.ContentsHead = SubstVar(Block.Find("Contents::Header",DContentsH.c_str()),Vars);
+              Itm.FLFile = SubstVar(Block.Find("FileList",DFLFile.c_str()),Vars);
+              Itm.ExtraOverride = SubstVar(Block.Find("ExtraOverride"),Vars);
+           }
+
+           Itm.GetGeneral(Setup,Block);
+           PkgList.push_back(Itm);
+        }
+      }
+      
+      Top = Top->Next;
+   }      
+}
+                                                                       /*}}}*/
+// LoadBinDir - Load a 'bindirectory' section from the Generate Config /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
+{
+   // Process 'bindirectory' type sections
+   const Configuration::Item *Top = Setup.Tree("bindirectory");
+   for (Top = (Top == 0?0:Top->Child); Top != 0;)
+   {
+      Configuration Block(Top);
+      
+      PackageMap Itm;
+      Itm.PkgFile = Block.Find("Packages");
+      Itm.SrcFile = Block.Find("Sources");
+      Itm.BinCacheDB = Block.Find("BinCacheDB");
+      Itm.BinOverride = Block.Find("BinOverride");
+      Itm.ExtraOverride = Block.Find("ExtraOverride");
+      Itm.SrcExtraOverride = Block.Find("SrcExtraOverride");
+      Itm.SrcOverride = Block.Find("SrcOverride");
+      Itm.BaseDir = Top->Tag;
+      Itm.FLFile = Block.Find("FileList");
+      Itm.InternalPrefix = Block.Find("InternalPrefix",Top->Tag.c_str());
+      Itm.Contents = Block.Find("Contents");
+      Itm.ContentsHead = Block.Find("Contents::Header");
+      
+      Itm.GetGeneral(Setup,Block);
+      PkgList.push_back(Itm);
+      
+      Top = Top->Next;
+   }      
+}
+                                                                       /*}}}*/
+
+// ShowHelp - Show the help text                                       /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool ShowHelp(CommandLine &CmdL)
+{
+   ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
+           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+   if (_config->FindB("version") == true)
+      return true;
+
+   cout << 
+    _("Usage: apt-ftparchive [options] command\n"
+      "Commands: packages binarypath [overridefile [pathprefix]]\n"
+      "          sources srcpath [overridefile [pathprefix]]\n"
+      "          contents path\n"
+      "          release path\n"
+      "          generate config [groups]\n"
+      "          clean config\n"
+      "\n"
+      "apt-ftparchive generates index files for Debian archives. It supports\n"
+      "many styles of generation from fully automated to functional replacements\n"
+      "for dpkg-scanpackages and dpkg-scansources\n"
+      "\n"
+      "apt-ftparchive generates Package files from a tree of .debs. The\n"
+      "Package file contains the contents of all the control fields from\n"
+      "each package as well as the MD5 hash and filesize. An override file\n"
+      "is supported to force the value of Priority and Section.\n"
+      "\n"
+      "Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+      "The --source-override option can be used to specify a src override file\n"
+      "\n"
+      "The 'packages' and 'sources' command should be run in the root of the\n"
+      "tree. BinaryPath should point to the base of the recursive search and \n"
+      "override file should contain the override flags. Pathprefix is\n"
+      "appended to the filename fields if present. Example usage from the \n"
+      "Debian archive:\n"
+      "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+      "               dists/potato/main/binary-i386/Packages\n"
+      "\n"
+      "Options:\n"
+      "  -h    This help text\n"
+      "  --md5 Control MD5 generation\n"
+      "  -s=?  Source override file\n"
+      "  -q    Quiet\n"
+      "  -d=?  Select the optional caching database\n"
+      "  --no-delink Enable delinking debug mode\n"
+      "  --contents  Control contents file generation\n"
+      "  -c=?  Read this configuration file\n"
+      "  -o=?  Set an arbitrary configuration option") << endl;
+   
+   return true;
+}
+                                                                       /*}}}*/
+// SimpleGenPackages - Generate a Packages file for a directory tree   /*{{{*/
+// ---------------------------------------------------------------------
+/* This emulates dpkg-scanpackages's command line interface. 'mostly' */
+bool SimpleGenPackages(CommandLine &CmdL)
+{
+   if (CmdL.FileSize() < 2)
+      return ShowHelp(CmdL);
+   
+   string Override;
+   if (CmdL.FileSize() >= 3)
+      Override = CmdL.FileList[2];
+   
+   // Create a package writer object.
+   PackagesWriter Packages(_config->Find("APT::FTPArchive::DB"),
+                          Override, "");   
+   if (_error->PendingError() == true)
+      return false;
+   
+   if (CmdL.FileSize() >= 4)
+      Packages.PathPrefix = CmdL.FileList[3];
+   
+   // Do recursive directory searching
+   if (Packages.RecursiveScan(CmdL.FileList[1]) == false)
+      return false;
+
+   return true;
+}
+                                                                       /*}}}*/
+// SimpleGenContents - Generate a Contents listing                     /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool SimpleGenContents(CommandLine &CmdL)
+{
+   if (CmdL.FileSize() < 2)
+      return ShowHelp(CmdL);
+   
+   // Create a package writer object.
+   ContentsWriter Contents(_config->Find("APT::FTPArchive::DB"));
+   if (_error->PendingError() == true)
+      return false;
+   
+   // Do recursive directory searching
+   if (Contents.RecursiveScan(CmdL.FileList[1]) == false)
+      return false;
+
+   Contents.Finish();
+   
+   return true;
+}
+                                                                       /*}}}*/
+// SimpleGenSources - Generate a Sources file for a directory tree     /*{{{*/
+// ---------------------------------------------------------------------
+/* This emulates dpkg-scanpackages's command line interface. 'mostly' */
+bool SimpleGenSources(CommandLine &CmdL)
+{
+   if (CmdL.FileSize() < 2)
+      return ShowHelp(CmdL);
+   
+   string Override;
+   if (CmdL.FileSize() >= 3)
+      Override = CmdL.FileList[2];
+   
+   string SOverride;
+   if (Override.empty() == false)
+      SOverride = Override + ".src";
+   
+   SOverride = _config->Find("APT::FTPArchive::SourceOverride",
+                            SOverride.c_str());
+       
+   // Create a package writer object.
+   SourcesWriter Sources(Override,SOverride);
+   if (_error->PendingError() == true)
+      return false;
+   
+   if (CmdL.FileSize() >= 4)
+      Sources.PathPrefix = CmdL.FileList[3];
+   
+   // Do recursive directory searching
+   if (Sources.RecursiveScan(CmdL.FileList[1]) == false)
+      return false;
+
+   return true;
+}
+                                                                       /*}}}*/
+// SimpleGenRelease - Generate a Release file for a directory tree     /*{{{*/
+// ---------------------------------------------------------------------
+bool SimpleGenRelease(CommandLine &CmdL)
+{
+   if (CmdL.FileSize() < 2)
+      return ShowHelp(CmdL);
+
+   string Dir = CmdL.FileList[1];
+
+   ReleaseWriter Release("");
+   Release.DirStrip = Dir;
+
+   if (_error->PendingError() == true)
+      return false;
+
+   if (Release.RecursiveScan(Dir) == false)
+      return false;
+
+   Release.Finish();
+
+   return true;
+}
+
+                                                                       /*}}}*/
+// Generate - Full generate, using a config file                       /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool Generate(CommandLine &CmdL)
+{
+   struct CacheDB::Stats SrcStats;
+   if (CmdL.FileSize() < 2)
+      return ShowHelp(CmdL);
+
+   struct timeval StartTime;
+   gettimeofday(&StartTime,0);   
+   struct CacheDB::Stats Stats;
+   
+   // Read the configuration file.
+   Configuration Setup;
+   if (ReadConfigFile(Setup,CmdL.FileList[1],true) == false)
+      return false;
+
+   vector<PackageMap> PkgList;
+   LoadTree(PkgList,Setup);
+   LoadBinDir(PkgList,Setup);
+
+   // Sort by cache DB to improve IO locality.
+   stable_sort(PkgList.begin(),PkgList.end(),PackageMap::DBCompare());
+               
+   // Generate packages
+   if (CmdL.FileSize() <= 2)
+   {
+      for (vector<PackageMap>::iterator I = PkgList.begin(); I != PkgList.end(); I++)
+        if (I->GenPackages(Setup,Stats) == false)
+           _error->DumpErrors();
+      for (vector<PackageMap>::iterator I = PkgList.begin(); I != PkgList.end(); I++)
+        if (I->GenSources(Setup,SrcStats) == false)
+           _error->DumpErrors();
+   }
+   else
+   {
+      // Make a choice list out of the package list..
+      RxChoiceList *List = new RxChoiceList[2*PkgList.size()+1];
+      RxChoiceList *End = List;
+      for (vector<PackageMap>::iterator I = PkgList.begin(); I != PkgList.end(); I++)
+      {
+        End->UserData = &(*I);
+        End->Str = I->BaseDir.c_str();
+        End++;
+        
+        End->UserData = &(*I);
+        End->Str = I->Tag.c_str();
+        End++;  
+      }
+      End->Str = 0;
+     
+      // Regex it
+      if (RegexChoice(List,CmdL.FileList + 2,CmdL.FileList + CmdL.FileSize()) == 0)
+      {
+        delete [] List;
+        return _error->Error(_("No selections matched"));
+      }
+      _error->DumpErrors();
+      
+      // Do the generation for Packages
+      for (End = List; End->Str != 0; End++)
+      {
+        if (End->Hit == false)
+           continue;
+        
+        PackageMap *I = (PackageMap *)End->UserData;
+        if (I->PkgDone == true)
+           continue;
+        if (I->GenPackages(Setup,Stats) == false)
+           _error->DumpErrors();
+      }
+      
+      // Do the generation for Sources
+      for (End = List; End->Str != 0; End++)
+      {
+        if (End->Hit == false)
+           continue;
+        
+        PackageMap *I = (PackageMap *)End->UserData;
+        if (I->SrcDone == true)
+           continue;
+        if (I->GenSources(Setup,SrcStats) == false)
+           _error->DumpErrors();
+      }
+      
+      delete [] List;
+   }
+   
+   if (_config->FindB("APT::FTPArchive::Contents",true) == false)
+      return true;
+   
+   c1out << "Done Packages, Starting contents." << endl;
+
+   // Sort the contents file list by date
+   string ArchiveDir = Setup.FindDir("Dir::ArchiveDir");
+   for (vector<PackageMap>::iterator I = PkgList.begin(); I != PkgList.end(); I++)
+   {
+      struct stat A;
+      if (MultiCompress::GetStat(flCombine(ArchiveDir,I->Contents),
+                                I->CntCompress,A) == false)
+        time(&I->ContentsMTime);
+      else
+        I->ContentsMTime = A.st_mtime;
+   }
+   stable_sort(PkgList.begin(),PkgList.end(),PackageMap::ContentsCompare());
+   
+   /* Now for Contents.. The process here is to do a make-like dependency
+      check. Each contents file is verified to be newer than the package files
+      that describe the debs it indexes. Since the package files contain 
+      hashes of the .debs this means they have not changed either so the 
+      contents must be up to date. */
+   unsigned long MaxContentsChange = Setup.FindI("Default::MaxContentsChange",UINT_MAX)*1024;
+   for (vector<PackageMap>::iterator I = PkgList.begin(); I != PkgList.end(); I++)
+   {
+      // This record is not relevent
+      if (I->ContentsDone == true ||
+         I->Contents.empty() == true)
+        continue;
+
+      // Do not do everything if the user specified sections.
+      if (CmdL.FileSize() > 2 && I->PkgDone == false)
+        continue;
+
+      struct stat A,B;
+      if (MultiCompress::GetStat(flCombine(ArchiveDir,I->Contents),I->CntCompress,A) == true)
+      {
+        if (MultiCompress::GetStat(flCombine(ArchiveDir,I->PkgFile),I->PkgCompress,B) == false)
+        {
+           _error->Warning(_("Some files are missing in the package file group `%s'"),I->PkgFile.c_str());
+           continue;
+        }
+        
+        if (A.st_mtime > B.st_mtime)
+           continue;
+      }
+      
+      if (I->GenContents(Setup,PkgList.begin(),PkgList.end(),
+                        MaxContentsChange) == false)
+        _error->DumpErrors();
+      
+      // Hit the limit?
+      if (MaxContentsChange == 0)
+      {
+        c1out << "Hit contents update byte limit" << endl;
+        break;
+      }      
+   }
+   
+   struct timeval NewTime;
+   gettimeofday(&NewTime,0);   
+   double Delta = NewTime.tv_sec - StartTime.tv_sec + 
+                  (NewTime.tv_usec - StartTime.tv_usec)/1000000.0;
+   c1out << "Done. " << SizeToStr(Stats.Bytes) << "B in " << Stats.Packages 
+         << " archives. Took " << TimeToStr((long)Delta) << endl;
+   
+   return true;
+}
+                                                                       /*}}}*/
+// Clean - Clean out the databases                                     /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool Clean(CommandLine &CmdL)
+{
+   if (CmdL.FileSize() != 2)
+      return ShowHelp(CmdL);
+
+   // Read the configuration file.
+   Configuration Setup;
+   if (ReadConfigFile(Setup,CmdL.FileList[1],true) == false)
+      return false;
+
+   vector<PackageMap> PkgList;
+   LoadTree(PkgList,Setup);
+   LoadBinDir(PkgList,Setup);
+
+   // Sort by cache DB to improve IO locality.
+   stable_sort(PkgList.begin(),PkgList.end(),PackageMap::DBCompare());
+
+   string CacheDir = Setup.FindDir("Dir::CacheDir");
+   
+   for (vector<PackageMap>::iterator I = PkgList.begin(); I != PkgList.end(); )
+   {
+      c0out << I->BinCacheDB << endl;
+      CacheDB DB(flCombine(CacheDir,I->BinCacheDB));
+      if (DB.Clean() == false)
+        _error->DumpErrors();
+      
+      string CacheDB = I->BinCacheDB;
+      for (; I != PkgList.end() && I->BinCacheDB == CacheDB; I++);
+   }
+   
+   return true;
+}
+                                                                       /*}}}*/
+
+int main(int argc, const char *argv[])
+{
+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
+   struct nlist nl[2];
+   memset(nl, 0, sizeof(nl));
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
+   nlist("/usr/lib/libc.dylib", nl);
+   if (nl[0].n_type != N_UNDF)
+       *(int *) nl[0].n_value = 0;
+#endif
+
+   CommandLine::Args Args[] = {
+      {'h',"help","help",0},
+      {0,"md5","APT::FTPArchive::MD5",0},
+      {'v',"version","version",0},
+      {'d',"db","APT::FTPArchive::DB",CommandLine::HasArg},
+      {'s',"source-override","APT::FTPArchive::SourceOverride",CommandLine::HasArg},
+      {'q',"quiet","quiet",CommandLine::IntLevel},
+      {'q',"silent","quiet",CommandLine::IntLevel},
+      {0,"delink","APT::FTPArchive::DeLinkAct",0},
+      {0,"readonly","APT::FTPArchive::ReadOnlyDB",0},
+      {0,"contents","APT::FTPArchive::Contents",0},
+      {'c',"config-file",0,CommandLine::ConfigFile},
+      {'o',"option",0,CommandLine::ArbItem},
+      {0,0,0,0}};
+   CommandLine::Dispatch Cmds[] = {{"packages",&SimpleGenPackages},
+                                   {"contents",&SimpleGenContents},
+                                   {"sources",&SimpleGenSources},
+                                   {"release",&SimpleGenRelease},
+                                   {"generate",&Generate},
+                                   {"clean",&Clean},
+                                  {"help",&ShowHelp},
+                                   {0,0}};
+
+   // Parse the command line and initialize the package library
+   CommandLine CmdL(Args,_config);
+   if (CmdL.Parse(argc,argv) == false)
+   {
+      _error->DumpErrors();
+      return 100;
+   }
+   
+   // See if the help should be shown
+   if (_config->FindB("help") == true ||
+       _config->FindB("version") == true ||
+       CmdL.FileSize() == 0)
+   {
+      ShowHelp(CmdL);
+      return 0;
+   }
+   
+   // Setup the output streams
+   c0out.rdbuf(clog.rdbuf());
+   c1out.rdbuf(clog.rdbuf());
+   c2out.rdbuf(clog.rdbuf());
+   Quiet = _config->FindI("quiet",0);
+   if (Quiet > 0)
+      c0out.rdbuf(devnull.rdbuf());
+   if (Quiet > 1)
+      c1out.rdbuf(devnull.rdbuf());
+   // Match the operation
+   CmdL.DispatchArg(Cmds);
+   
+   if (_error->empty() == false)
+   {
+      bool Errors = _error->PendingError();
+      _error->DumpErrors();
+      return Errors == true?100:0;
+   }
+   return 0;
+}