support 'apt build-dep .' (aka: without /)

[apt.git] / ftparchive / cachedb.cc

diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index cbcdfedc6054b871bdee4d0fbb6c83389fd9aea5..868029abde4d6904785772bc7cb753a7e3dbd19e 100644 (file)
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cachedb.cc,v 1.3 2001/05/29 03:50:33 jgg Exp $
+// $Id: cachedb.cc,v 1.7 2004/05/08 19:41:01 mdz Exp $

 /* ######################################################################
 
    CacheDB
 /* ######################################################################
 
    CacheDB


@@ -10,25 +10,51 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "cachedb.h"
-#endif
-
-#include "cachedb.h"
+#include <config.h>

 
 #include <apt-pkg/error.h>
 #include <apt-pkg/md5.h>
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/md5.h>

+#include <apt-pkg/sha1.h>
+#include <apt-pkg/sha2.h>

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

-    
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/debfile.h>
+#include <apt-pkg/gpgv.h>
+#include <apt-pkg/hashes.h>
+

 #include <netinet/in.h>       // htonl, etc
 #include <netinet/in.h>       // htonl, etc

+#include <ctype.h>
+#include <stddef.h>
+#include <sys/stat.h>
+#include <strings.h>
+
+#include "cachedb.h"
+
+#include <apti18n.h>

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

+CacheDB::CacheDB(std::string const &DB)
+   : Dbp(0), Fd(NULL), DebFile(0)
+{
+   TmpKey[0]='\0';
+   ReadyDB(DB);
+}
+
+CacheDB::~CacheDB()
+{
+   ReadyDB();
+   delete DebFile;
+   CloseFile();
+}
+

 // CacheDB::ReadyDB - Ready the DB2                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* This opens the DB2 file for caching package information */
 // CacheDB::ReadyDB - Ready the DB2                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* This opens the DB2 file for caching package information */

-bool CacheDB::ReadyDB(string DB)
+bool CacheDB::ReadyDB(std::string const &DB)

 {
 {

+   int err;
+

    ReadOnly = _config->FindB("APT::FTPArchive::ReadOnlyDB",false);
    
    // Close the old DB
    ReadOnly = _config->FindB("APT::FTPArchive::ReadOnlyDB",false);
    
    // Close the old DB


@@ -39,72 +65,272 @@ bool CacheDB::ReadyDB(string DB)
       corrupted DB */
    if (DBFailed() == true)
    {
       corrupted DB */
    if (DBFailed() == true)
    {

-      _error->Warning("DB was corrupted, file renamed to %s.old",DBFile.c_str());
+      _error->Warning(_("DB was corrupted, file renamed to %s.old"),DBFile.c_str());

       rename(DBFile.c_str(),(DBFile+".old").c_str());
    }
    
    DBLoaded = false;
    Dbp = 0;
       rename(DBFile.c_str(),(DBFile+".old").c_str());
    }
    
    DBLoaded = false;
    Dbp = 0;

-   DBFile = string();
+   DBFile = std::string();

    
    if (DB.empty())
       return true;
    
    if (DB.empty())
       return true;

-   
-   if ((errno = db_open(DB.c_str(),DB_HASH,
+
+   db_create(&Dbp, NULL, 0);
+   if ((err = Dbp->open(Dbp, NULL, DB.c_str(), NULL, DB_BTREE,

                         (ReadOnly?DB_RDONLY:DB_CREATE),
                         (ReadOnly?DB_RDONLY:DB_CREATE),

-                        0644,0,0,&Dbp)) != 0)
+                        0644)) != 0)

    {
    {

-      Dbp = 0;
-      return _error->Errno("db_open","Unable to open DB2 file %s",DB.c_str());
+      if (err == DB_OLD_VERSION)
+      {
+          _error->Warning(_("DB is old, attempting to upgrade %s"),DBFile.c_str());
+         err = Dbp->upgrade(Dbp, DB.c_str(), 0);
+         if (!err)
+            err = Dbp->open(Dbp, NULL, DB.c_str(), NULL, DB_HASH,
+                            (ReadOnly?DB_RDONLY:DB_CREATE), 0644);
+
+      }
+      // the database format has changed from DB_HASH to DB_BTREE in 
+      // apt 0.6.44
+      if (err == EINVAL)
+      {
+        _error->Error(_("DB format is invalid. If you upgraded from an older version of apt, please remove and re-create the database."));
+      }
+      if (err)
+      {
+          Dbp = 0;
+          return _error->Error(_("Unable to open DB file %s: %s"),DB.c_str(), db_strerror(err));
+      }

    }
    }

-   
+

    DBFile = DB;
    DBLoaded = true;
    return true;
 }
                                                                        /*}}}*/
    DBFile = DB;
    DBLoaded = true;
    return true;
 }
                                                                        /*}}}*/

-// CacheDB::SetFile - Select a file to be working with                 /*{{{*/
+// CacheDB::OpenFile - Open the file                                   /*{{{*/

 // ---------------------------------------------------------------------
 // ---------------------------------------------------------------------

-/* All future actions will be performed against this file */
-bool CacheDB::SetFile(string FileName,struct stat St,FileFd *Fd)
+/* */
+bool CacheDB::OpenFile()

 {
 {

-   delete DebFile;
-   DebFile = 0;
-   this->FileName = FileName;
-   this->Fd = Fd;
-   this->FileStat = St;
-   FileStat = St;   
-   memset(&CurStat,0,sizeof(CurStat));
-   
-   Stats.Bytes += St.st_size;
-   Stats.Packages++;
-   
-   if (DBLoaded == false)
+   // always close existing file first
+   CloseFile();
+
+   // open a new file
+   Fd = new FileFd(FileName,FileFd::ReadOnly);
+   if (_error->PendingError() == true)
+   {
+      CloseFile();
+      return false;
+   }
+   return true;
+}
+                                                                       /*}}}*/
+// CacheDB::CloseFile - Close the file                                 /*{{{*/
+void CacheDB::CloseFile()
+{
+   if(Fd != NULL)
+   {
+      delete Fd;
+      Fd = NULL;
+   }
+}
+                                                                       /*}}}*/
+// CacheDB::OpenDebFile - Open a debfile                               /*{{{*/
+bool CacheDB::OpenDebFile()
+{
+   // always close existing file first
+   CloseDebFile();
+
+   // first open the fd, then pass it to the debDebFile
+   if(OpenFile() == false)
+      return false;
+   DebFile = new debDebFile(*Fd);
+   if (_error->PendingError() == true)
+      return false;
+   return true;
+}
+                                                                       /*}}}*/
+// CacheDB::CloseDebFile - Close a debfile again                       /*{{{*/
+void CacheDB::CloseDebFile()
+{
+   CloseFile();
+
+   if(DebFile != NULL)
+   {
+      delete DebFile;
+      DebFile = NULL;
+   }
+}
+                                                                       /*}}}*/
+// CacheDB::GetFileStat - Get stats from the file                      /*{{{*/
+// ---------------------------------------------------------------------
+/* This gets the size from the database if it's there.  If we need
+ * to look at the file, also get the mtime from the file. */
+bool CacheDB::GetFileStat(bool const &doStat)
+{
+   if ((CurStat.Flags & FlSize) == FlSize && doStat == false)

       return true;
 
       return true;
 

-   InitQuery("st");
+   /* Get it from the file. */
+   if (OpenFile() == false)
+      return false;

    
    

-   // Ensure alignment of the returned structure
+   // Stat the file
+   struct stat St;
+   if (fstat(Fd->Fd(),&St) != 0)
+   {
+      CloseFile();
+      return _error->Errno("fstat",
+                           _("Failed to stat %s"),FileName.c_str());
+   }
+   CurStat.FileSize = St.st_size;
+   CurStat.mtime = htonl(St.st_mtime);
+   CurStat.Flags |= FlSize;
+   
+   return true;
+}
+                                                                       /*}}}*/
+// CacheDB::GetCurStatCompatOldFormat                                  /*{{{*/
+// ---------------------------------------------------------------------
+/* Read the old (32bit FileSize) StateStore format from disk */
+bool CacheDB::GetCurStatCompatOldFormat()
+{
+   InitQueryStats();
+   Data.data = &CurStatOldFormat;
+   Data.flags = DB_DBT_USERMEM;
+   Data.ulen = sizeof(CurStatOldFormat);
+   if (Get() == false)
+   {
+      CurStat.Flags = 0;
+   } else {
+      CurStat.Flags = CurStatOldFormat.Flags;
+      CurStat.mtime = CurStatOldFormat.mtime;
+      CurStat.FileSize = CurStatOldFormat.FileSize;
+      memcpy(CurStat.MD5, CurStatOldFormat.MD5, sizeof(CurStat.MD5));
+      memcpy(CurStat.SHA1, CurStatOldFormat.SHA1, sizeof(CurStat.SHA1));
+      memcpy(CurStat.SHA256, CurStatOldFormat.SHA256, sizeof(CurStat.SHA256));
+   }
+   return true;
+}
+                                                                       /*}}}*/
+// CacheDB::GetCurStatCompatOldFormat                                  /*{{{*/
+// ---------------------------------------------------------------------
+/* Read the new (64bit FileSize) StateStore format from disk */
+bool CacheDB::GetCurStatCompatNewFormat()
+{
+   InitQueryStats();

    Data.data = &CurStat;
    Data.data = &CurStat;

-   Data.ulen = sizeof(CurStat);

    Data.flags = DB_DBT_USERMEM;
    Data.flags = DB_DBT_USERMEM;

-   // Lookup the stat info and confirm the file is unchanged
-   if (Get() == true)
+   Data.ulen = sizeof(CurStat);
+   if (Get() == false)
+   {
+      CurStat.Flags = 0;
+   }
+   return true;
+}
+                                                                       /*}}}*/
+// CacheDB::GetCurStat - Set the CurStat variable.                     /*{{{*/
+// ---------------------------------------------------------------------
+/* Sets the CurStat variable.  Either to 0 if no database is used
+ * or to the value in the database if one is used */
+bool CacheDB::GetCurStat()
+{
+   memset(&CurStat,0,sizeof(CurStat));
+   
+   if (DBLoaded)

    {
    {

-      if (CurStat.st_mtime != htonl(St.st_mtime))
+      // do a first query to just get the size of the data on disk
+      InitQueryStats();
+      Data.data = &CurStat;
+      Data.flags = DB_DBT_USERMEM;
+      Data.ulen = 0;
+      Get();
+
+      if (Data.size == 0)
+      {
+         // nothing needs to be done, we just have not data for this deb
+      }
+      // check if the record is written in the old format (32bit filesize)
+      else if(Data.size == sizeof(CurStatOldFormat))

       {
       {

-        CurStat.st_mtime = htonl(St.st_mtime);
-        CurStat.Flags = 0;
-        _error->Warning("File date has changed %s",FileName.c_str());
-      }      
+         GetCurStatCompatOldFormat();
+      }
+      else if(Data.size == sizeof(CurStat))
+      {
+         GetCurStatCompatNewFormat();
+      } else {
+         return _error->Error("Cache record size mismatch (%ul)", Data.size);
+      }
+
+      CurStat.Flags = ntohl(CurStat.Flags);
+      CurStat.FileSize = ntohl(CurStat.FileSize);

    }      
    }      

-   else
-   {
-      CurStat.st_mtime = htonl(St.st_mtime);
-      CurStat.Flags = 0;
-   }   
-   CurStat.Flags = ntohl(CurStat.Flags);
+   return true;
+}
+                                                                       /*}}}*/
+// CacheDB::GetFileInfo - Get all the info about the file              /*{{{*/
+// ---------------------------------------------------------------------
+bool CacheDB::GetFileInfo(std::string const &FileName, bool const &DoControl, bool const &DoContents,
+                               bool const &GenContentsOnly, bool const DoSource, unsigned int const DoHashes,
+                          bool const &checkMtime)
+{
+   this->FileName = FileName;
+
+   if (GetCurStat() == false)
+      return false;

    OldStat = CurStat;
    OldStat = CurStat;

+
+   if (GetFileStat(checkMtime) == false)
+      return false;
+
+   /* if mtime changed, update CurStat from disk */
+   if (checkMtime == true && OldStat.mtime != CurStat.mtime)
+      CurStat.Flags = FlSize;
+
+   Stats.Bytes += CurStat.FileSize;
+   ++Stats.Packages;
+
+   if ((DoControl && LoadControl() == false)
+        || (DoContents && LoadContents(GenContentsOnly) == false)
+        || (DoSource && LoadSource() == false)
+        || (DoHashes != 0 && GetHashes(false, DoHashes) == false)
+      )
+   {
+      return false;
+   }
+
+   return true;
+}
+                                                                       /*}}}*/
+bool CacheDB::LoadSource()                                             /*{{{*/
+{
+   // Try to read the control information out of the DB.
+   if ((CurStat.Flags & FlSource) == FlSource)
+   {
+      // Lookup the control information
+      InitQuerySource();
+      if (Get() == true && Dsc.TakeDsc(Data.data, Data.size) == true)
+      {
+           return true;
+      }
+      CurStat.Flags &= ~FlSource;
+   }
+   if (OpenFile() == false)
+      return false;
+
+   Stats.Misses++;
+   if (Dsc.Read(FileName) == false)
+      return false;
+
+   if (Dsc.Length == 0)
+      return _error->Error(_("Failed to read .dsc"));
+
+   // Write back the control information
+   InitQuerySource();
+   if (Put(Dsc.Data.c_str(), Dsc.Length) == true)
+      CurStat.Flags |= FlSource;
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -117,29 +343,24 @@ bool CacheDB::LoadControl()
    if ((CurStat.Flags & FlControl) == FlControl)
    {
       // Lookup the control information
    if ((CurStat.Flags & FlControl) == FlControl)
    {
       // Lookup the control information

-      InitQuery("cl");
+      InitQueryControl();

       if (Get() == true && Control.TakeControl(Data.data,Data.size) == true)
            return true;
       CurStat.Flags &= ~FlControl;
    }
    
       if (Get() == true && Control.TakeControl(Data.data,Data.size) == true)
            return true;
       CurStat.Flags &= ~FlControl;
    }
    

-   // Create a deb instance to read the archive
-   if (DebFile == 0)
-   {
-      DebFile = new debDebFile(*Fd);
-      if (_error->PendingError() == true)
-        return false;
-   }
+   if(OpenDebFile() == false)
+      return false;

    
    Stats.Misses++;
    if (Control.Read(*DebFile) == false)
       return false;
 
    if (Control.Control == 0)
    
    Stats.Misses++;
    if (Control.Read(*DebFile) == false)
       return false;
 
    if (Control.Control == 0)

-      return _error->Error("Archive has no control record");
+      return _error->Error(_("Archive has no control record"));

    
    // Write back the control information
    
    // Write back the control information

-   InitQuery("cl");
+   InitQueryControl();

    if (Put(Control.Control,Control.Length) == true)
       CurStat.Flags |= FlControl;
    return true;
    if (Put(Control.Control,Control.Length) == true)
       CurStat.Flags |= FlControl;
    return true;


@@ -148,7 +369,7 @@ bool CacheDB::LoadControl()
 // CacheDB::LoadContents - Load the File Listing                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CacheDB::LoadContents - Load the File Listing                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool CacheDB::LoadContents(bool GenOnly)
+bool CacheDB::LoadContents(bool const &GenOnly)

 {
    // Try to read the control information out of the DB.
    if ((CurStat.Flags & FlContents) == FlContents)
 {
    // Try to read the control information out of the DB.
    if ((CurStat.Flags & FlContents) == FlContents)


@@ -157,7 +378,7 @@ bool CacheDB::LoadContents(bool GenOnly)
         return true;
       
       // Lookup the contents information
         return true;
       
       // Lookup the contents information

-      InitQuery("cn");
+      InitQueryContent();

       if (Get() == true)
       {
         if (Contents.TakeContents(Data.data,Data.size) == true)
       if (Get() == true)
       {
         if (Contents.TakeContents(Data.data,Data.size) == true)


@@ -167,55 +388,129 @@ bool CacheDB::LoadContents(bool GenOnly)
       CurStat.Flags &= ~FlContents;
    }
    
       CurStat.Flags &= ~FlContents;
    }
    

-   // Create a deb instance to read the archive
-   if (DebFile == 0)
-   {
-      DebFile = new debDebFile(*Fd);
-      if (_error->PendingError() == true)
-        return false;
-   }
+   if(OpenDebFile() == false)
+      return false;

 
 

+   Stats.Misses++;

    if (Contents.Read(*DebFile) == false)
       return false;        
    
    // Write back the control information
    if (Contents.Read(*DebFile) == false)
       return false;        
    
    // Write back the control information

-   InitQuery("cn");
+   InitQueryContent();

    if (Put(Contents.Data,Contents.CurSize) == true)
       CurStat.Flags |= FlContents;
    return true;
 }
                                                                        /*}}}*/
    if (Put(Contents.Data,Contents.CurSize) == true)
       CurStat.Flags |= FlContents;
    return true;
 }
                                                                        /*}}}*/

-// CacheDB::GetMD5 - Get the MD5 hash                                  /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool CacheDB::GetMD5(string &MD5Res,bool GenOnly)
+// CacheDB::GetHashes - Get the hashs                                  /*{{{*/
+static std::string bytes2hex(uint8_t *bytes, size_t length) {
+   char buf[3];
+   std::string space;
+
+   space.reserve(length*2 + 1);
+   for (size_t i = 0; i < length; i++) {
+      snprintf(buf, sizeof(buf), "%02x", bytes[i]);
+      space.append(buf);
+   }
+   return space;
+}
+
+static inline unsigned char xdig2num(char const &dig) {
+   if (isdigit(dig)) return dig - '0';
+   if ('a' <= dig && dig <= 'f') return dig - 'a' + 10;
+   if ('A' <= dig && dig <= 'F') return dig - 'A' + 10;
+   return 0;
+}
+
+static void hex2bytes(uint8_t *bytes, const char *hex, int length) {
+   while (length-- > 0) {
+      *bytes = 0;
+      if (isxdigit(hex[0]) && isxdigit(hex[1])) {
+         *bytes = xdig2num(hex[0]) * 16 + xdig2num(hex[1]);
+         hex += 2;
+      }
+      bytes++;
+   } 
+}
+bool CacheDB::GetHashes(bool const GenOnly, unsigned int const DoHashes)

 {
 {

-   // Try to read the control information out of the DB.
-   if ((CurStat.Flags & FlMD5) == FlMD5)
+   unsigned int notCachedHashes = 0;
+   if ((CurStat.Flags & FlMD5) != FlMD5)

    {
    {

-      if (GenOnly == true)
-        return true;
-      
-      InitQuery("m5");
-      if (Get() == true)
+      notCachedHashes = notCachedHashes | Hashes::MD5SUM;
+   }
+   if ((CurStat.Flags & FlSHA1) != FlSHA1)
+   {
+      notCachedHashes = notCachedHashes | Hashes::SHA1SUM;
+   }
+   if ((CurStat.Flags & FlSHA256) != FlSHA256)
+   {
+      notCachedHashes = notCachedHashes | Hashes::SHA256SUM;
+   }
+   if ((CurStat.Flags & FlSHA512) != FlSHA512)
+   {
+      notCachedHashes = notCachedHashes | Hashes::SHA512SUM;
+   }
+   unsigned int FlHashes = DoHashes & notCachedHashes;
+   HashesList.clear();
+
+   if (FlHashes != 0)
+   {
+      if (OpenFile() == false)
+        return false;
+
+      Hashes hashes(FlHashes);
+      if (Fd->Seek(0) == false || hashes.AddFD(*Fd, CurStat.FileSize) == false)
+        return false;
+
+      HashStringList hl = hashes.GetHashStringList();
+      for (HashStringList::const_iterator hs = hl.begin(); hs != hl.end(); ++hs)

       {
       {

-        MD5Res = string((char *)Data.data,Data.size);
-        return true;
+        HashesList.push_back(*hs);
+        if (strcasecmp(hs->HashType().c_str(), "SHA512") == 0)
+        {
+           Stats.SHA512Bytes += CurStat.FileSize;
+           hex2bytes(CurStat.SHA512, hs->HashValue().data(), sizeof(CurStat.SHA512));
+           CurStat.Flags |= FlSHA512;
+        }
+        else if (strcasecmp(hs->HashType().c_str(), "SHA256") == 0)
+        {
+           Stats.SHA256Bytes += CurStat.FileSize;
+           hex2bytes(CurStat.SHA256, hs->HashValue().data(), sizeof(CurStat.SHA256));
+           CurStat.Flags |= FlSHA256;
+        }
+        else if (strcasecmp(hs->HashType().c_str(), "SHA1") == 0)
+        {
+           Stats.SHA1Bytes += CurStat.FileSize;
+           hex2bytes(CurStat.SHA1, hs->HashValue().data(), sizeof(CurStat.SHA1));
+           CurStat.Flags |= FlSHA1;
+        }
+        else if (strcasecmp(hs->HashType().c_str(), "MD5Sum") == 0)
+        {
+           Stats.MD5Bytes += CurStat.FileSize;
+           hex2bytes(CurStat.MD5, hs->HashValue().data(), sizeof(CurStat.MD5));
+           CurStat.Flags |= FlMD5;
+        }
+        else if (strcasecmp(hs->HashType().c_str(), "Checksum-FileSize") == 0)
+        {
+           // we store it in a different field already
+        }
+        else
+           return _error->Error("Got unknown unrequested hashtype %s", hs->HashType().c_str());

       }
       }

-      CurStat.Flags &= ~FlMD5;

    }
    }

-   
-   Stats.MD5Bytes += FileStat.st_size;
-        
-   MD5Summation MD5;
-   if (Fd->Seek(0) == false || MD5.AddFD(Fd->Fd(),FileStat.st_size) == false)
-      return false;
-   
-   MD5Res = MD5.Result();
-   InitQuery("m5");
-   if (Put(MD5Res.c_str(),MD5Res.length()) == true)
-      CurStat.Flags |= FlMD5;
-   return true;
+   if (GenOnly == true)
+      return true;
+
+   bool ret = true;
+#define PUSH_BACK_HASH(FLAG, TYPE, VALUE) \
+   if ((CurStat.Flags & FLAG) == FLAG) \
+      ret &= HashesList.push_back(HashString(TYPE, bytes2hex(VALUE, sizeof(VALUE))));
+   PUSH_BACK_HASH(FlMD5, "MD5Sum", CurStat.MD5);
+   PUSH_BACK_HASH(FlSHA1, "SHA1", CurStat.SHA1);
+   PUSH_BACK_HASH(FlSHA256, "SHA256", CurStat.SHA256);
+   PUSH_BACK_HASH(FlSHA512, "SHA512", CurStat.SHA512);
+   return ret;

 }
                                                                        /*}}}*/
 // CacheDB::Finish - Write back the cache structure                    /*{{{*/
 }
                                                                        /*}}}*/
 // CacheDB::Finish - Write back the cache structure                    /*{{{*/


@@ -225,14 +520,17 @@ bool CacheDB::Finish()
 {
    // Optimize away some writes.
    if (CurStat.Flags == OldStat.Flags &&
 {
    // Optimize away some writes.
    if (CurStat.Flags == OldStat.Flags &&

-       CurStat.st_mtime == OldStat.st_mtime)
+       CurStat.mtime == OldStat.mtime)

       return true;
       return true;

-   
+

    // Write the stat information
    CurStat.Flags = htonl(CurStat.Flags);
    // Write the stat information
    CurStat.Flags = htonl(CurStat.Flags);

-   InitQuery("st");
+   CurStat.FileSize = htonl(CurStat.FileSize);
+   InitQueryStats();

    Put(&CurStat,sizeof(CurStat));
    CurStat.Flags = ntohl(CurStat.Flags);
    Put(&CurStat,sizeof(CurStat));
    CurStat.Flags = ntohl(CurStat.Flags);

+   CurStat.FileSize = ntohl(CurStat.FileSize);
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -246,15 +544,9 @@ bool CacheDB::Clean()
 
    /* I'm not sure what VERSION_MINOR should be here.. 2.4.14 certainly
       needs the lower one and 2.7.7 needs the upper.. */
 
    /* I'm not sure what VERSION_MINOR should be here.. 2.4.14 certainly
       needs the lower one and 2.7.7 needs the upper.. */

-#if DB_VERSION_MAJOR >= 2 && DB_VERSION_MINOR >= 7
-   DBC *Cursor;
-   if ((errno = Dbp->cursor(Dbp,0,&Cursor,0)) != 0)
-      return _error->Error("Unable to get a cursor");
-#else

    DBC *Cursor;
    DBC *Cursor;

-   if ((errno = Dbp->cursor(Dbp,0,&Cursor)) != 0)
-      return _error->Error("Unable to get a cursor");
-#endif
+   if ((errno = Dbp->cursor(Dbp, NULL, &Cursor, 0)) != 0)
+      return _error->Error(_("Unable to get a cursor"));

    
    DBT Key;
    DBT Data;
    
    DBT Key;
    DBT Data;


@@ -262,22 +554,29 @@ bool CacheDB::Clean()
    memset(&Data,0,sizeof(Data));
    while ((errno = Cursor->c_get(Cursor,&Key,&Data,DB_NEXT)) == 0)
    {
    memset(&Data,0,sizeof(Data));
    while ((errno = Cursor->c_get(Cursor,&Key,&Data,DB_NEXT)) == 0)
    {

-      const char *Colon = (char *)Key.data;
-      for (; Colon != (char *)Key.data+Key.size && *Colon != ':'; Colon++);
-      if ((char *)Key.data+Key.size - Colon > 2)
+      const char *Colon = (char*)memrchr(Key.data, ':', Key.size);
+      if (Colon)

       {
       {

-        if (stringcmp((char *)Key.data,Colon,"st") == 0 ||
-            stringcmp((char *)Key.data,Colon,"cn") == 0 ||
-            stringcmp((char *)Key.data,Colon,"m5") == 0 ||
-            stringcmp((char *)Key.data,Colon,"cl") == 0)
+         if (stringcmp(Colon + 1, (char *)Key.data+Key.size,"st") == 0 ||
+             stringcmp(Colon + 1, (char *)Key.data+Key.size,"cl") == 0 ||
+             stringcmp(Colon + 1, (char *)Key.data+Key.size,"cs") == 0 ||
+             stringcmp(Colon + 1, (char *)Key.data+Key.size,"cn") == 0)

         {
         {

-           if (FileExists(string(Colon+1,(const char *)Key.data+Key.size)) == true)
-               continue;            
+            std::string FileName = std::string((const char *)Key.data,Colon);
+            if (FileExists(FileName) == true) {
+               continue;
+            }

         }
       }
         }
       }

-      

       Cursor->c_del(Cursor,0);
    }
       Cursor->c_del(Cursor,0);
    }

+   int res = Dbp->compact(Dbp, NULL, NULL, NULL, NULL, DB_FREE_SPACE, NULL);
+   if (res < 0)
+      _error->Warning("compact failed with result %i", res);
+
+   if(_config->FindB("Debug::APT::FTPArchive::Clean", false) == true)
+      Dbp->stat_print(Dbp, 0);
+

 
    return true;
 }
 
    return true;
 }