Log calling SUDO_USER or PKEXEC_UID in history.log

[apt.git] / ftparchive / cachedb.cc

diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index a1d70f912f8020c1ffebf62b2094028d530d93a0..17df9c1f10b2f0de3615a51bba91eea569eb42fd 100644 (file)
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -18,17 +18,40 @@
 #include <apt-pkg/sha2.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/sha2.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 <apti18n.h>

 #include "cachedb.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 const &DB)
+bool CacheDB::ReadyDB(std::string const &DB)

 {
    int err;
 
 {
    int err;
 


@@ -48,7 +71,7 @@ bool CacheDB::ReadyDB(string const &DB)
    
    DBLoaded = false;
    Dbp = 0;
    
    DBLoaded = false;
    Dbp = 0;

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

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


@@ -79,7 +102,7 @@ bool CacheDB::ReadyDB(string const &DB)
           return _error->Error(_("Unable to open DB file %s: %s"),DB.c_str(), db_strerror(err));
       }
    }
           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;


@@ -90,14 +113,54 @@ bool CacheDB::ReadyDB(string const &DB)
 /* */
 bool CacheDB::OpenFile()
 {
 /* */
 bool CacheDB::OpenFile()
 {

-       Fd = new FileFd(FileName,FileFd::ReadOnly);
-       if (_error->PendingError() == true)
-       {
-               delete Fd;
-               Fd = NULL;
-               return false;
-       }
-       return true;
+   // 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                      /*{{{*/
 }
                                                                        /*}}}*/
 // CacheDB::GetFileStat - Get stats from the file                      /*{{{*/


@@ -106,29 +169,65 @@ bool CacheDB::OpenFile()
  * to look at the file, also get the mtime from the file. */
 bool CacheDB::GetFileStat(bool const &doStat)
 {
  * 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)
-       {
-               /* Already worked out the file size */
-       }
-       else
-       {
-               /* Get it from the file. */
-               if (Fd == NULL && OpenFile() == false)
-               {
-                       return false;
-               }
-               // Stat the file
-               struct stat St;
-               if (fstat(Fd->Fd(),&St) != 0)
-               {
-                       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;
+   if ((CurStat.Flags & FlSize) == FlSize && doStat == false)
+      return true;
+
+   /* Get it from the file. */
+   if (OpenFile() == false)
+      return false;
+   
+   // 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.flags = DB_DBT_USERMEM;
+   Data.ulen = sizeof(CurStat);
+   if (Get() == false)
+   {
+      CurStat.Flags = 0;
+   }
+   return true;

 }
                                                                        /*}}}*/
 // CacheDB::GetCurStat - Set the CurStat variable.                     /*{{{*/
 }
                                                                        /*}}}*/
 // CacheDB::GetCurStat - Set the CurStat variable.                     /*{{{*/


@@ -139,75 +238,98 @@ bool CacheDB::GetCurStat()
 {
    memset(&CurStat,0,sizeof(CurStat));
    
 {
    memset(&CurStat,0,sizeof(CurStat));
    

-       if (DBLoaded)
-       {
-               /* First see if there is anything about it
-                  in the database */
-
-               /* Get the flags (and mtime) */
-   InitQuery("st");
-   // Ensure alignment of the returned structure
-   Data.data = &CurStat;
-   Data.ulen = sizeof(CurStat);
-   Data.flags = DB_DBT_USERMEM;
-               if (Get() == false)
+   if (DBLoaded)
+   {
+      // 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.Flags = 0;
-      }      
-               CurStat.Flags = ntohl(CurStat.Flags);
-               CurStat.FileSize = ntohl(CurStat.FileSize);
+         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);

    }      
    }      

-       return true;
+   return true;

 }
                                                                        /*}}}*/
 // CacheDB::GetFileInfo - Get all the info about the file              /*{{{*/
 // ---------------------------------------------------------------------
 }
                                                                        /*}}}*/
 // CacheDB::GetFileInfo - Get all the info about the file              /*{{{*/
 // ---------------------------------------------------------------------

-bool CacheDB::GetFileInfo(string const &FileName, bool const &DoControl, bool const &DoContents,
-                               bool const &GenContentsOnly, bool const &DoMD5, bool const &DoSHA1,
-                               bool const &DoSHA256,   bool const &DoSHA512, 
+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)
 {
                           bool const &checkMtime)
 {

-       this->FileName = FileName;
+   this->FileName = FileName;

 
 

-       if (GetCurStat() == false)
-   {
-               return false;
-   }   
+   if (GetCurStat() == false)
+      return false;

    OldStat = CurStat;
 
    OldStat = CurStat;
 

-       if (GetFileStat(checkMtime) == false)
-       {
-               delete Fd;
-               Fd = NULL;
-               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)
-               || (DoMD5 && GetMD5(false) == false)
-               || (DoSHA1 && GetSHA1(false) == false)
-               || (DoSHA256 && GetSHA256(false) == false)
-               || (DoSHA512 && GetSHA512(false) == false)
-           )
-       {
-               delete Fd;
-               Fd = NULL;
-               delete DebFile;
-               DebFile = NULL;
-               return false;   
-       }
-
-       delete Fd;
-       Fd = NULL;
-       delete DebFile;
-       DebFile = NULL;
+   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;
 }


@@ -221,23 +343,14 @@ 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;
    }
    

-   if (Fd == NULL && OpenFile() == false)
-   {
+   if(OpenDebFile() == false)

       return false;
       return false;

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

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


@@ -247,7 +360,7 @@ bool CacheDB::LoadControl()
       return _error->Error(_("Archive has no control record"));
    
    // Write back the control information
       return _error->Error(_("Archive has no control record"));
    
    // 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;


@@ -265,7 +378,7 @@ bool CacheDB::LoadContents(bool const &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)


@@ -275,35 +388,31 @@ bool CacheDB::LoadContents(bool const &GenOnly)
       CurStat.Flags &= ~FlContents;
    }
    
       CurStat.Flags &= ~FlContents;
    }
    

-   if (Fd == NULL && OpenFile() == false)
-   {
+   if(OpenDebFile() == false)

       return false;
       return false;

-   }
-   // Create a deb instance to read the archive
-   if (DebFile == 0)
-   {
-      DebFile = new debDebFile(*Fd);
-      if (_error->PendingError() == true)
-        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::GetHashes - Get the hashs                                  /*{{{*/
+static std::string bytes2hex(uint8_t *bytes, size_t length) {
+   char buf[3];
+   std::string space;

 
 

-static string bytes2hex(uint8_t *bytes, size_t length) {
-   char space[65];
-   if (length * 2 > sizeof(space) - 1) length = (sizeof(space) - 1) / 2;
-   for (size_t i = 0; i < length; i++)
-      snprintf(&space[i*2], 3, "%02x", bytes[i]);
-   return 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) {
 }
 
 static inline unsigned char xdig2num(char const &dig) {


@@ -323,129 +432,68 @@ static void hex2bytes(uint8_t *bytes, const char *hex, int length) {
       bytes++;
    } 
 }
       bytes++;
    } 
 }

-
-// CacheDB::GetMD5 - Get the MD5 hash                                  /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool CacheDB::GetMD5(bool const &GenOnly)
+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)
-   {
-      if (GenOnly == true)
-        return true;
-      
-      MD5Res = bytes2hex(CurStat.MD5, sizeof(CurStat.MD5));
-        return true;
-      }
-   
-   Stats.MD5Bytes += CurStat.FileSize;
-        
-   if (Fd == NULL && OpenFile() == false)
-   {
-      return false;
-   }
-   MD5Summation MD5;
-   if (Fd->Seek(0) == false || MD5.AddFD(Fd->Fd(),CurStat.FileSize) == false)
-      return false;
-   
-   MD5Res = MD5.Result();
-   hex2bytes(CurStat.MD5, MD5Res.data(), sizeof(CurStat.MD5));
-      CurStat.Flags |= FlMD5;
-   return true;
-}
-                                                                       /*}}}*/
-// CacheDB::GetSHA1 - Get the SHA1 hash                                        /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool CacheDB::GetSHA1(bool const &GenOnly)
-{
-   // Try to read the control information out of the DB.
-   if ((CurStat.Flags & FlSHA1) == FlSHA1)
-   {
-      if (GenOnly == true)
-        return true;
+   unsigned int FlHashes = DoHashes & (Hashes::MD5SUM | Hashes::SHA1SUM | Hashes::SHA256SUM | Hashes::SHA512SUM);
+   HashesList.clear();

 
 

-      SHA1Res = bytes2hex(CurStat.SHA1, sizeof(CurStat.SHA1));
-      return true;
-   }
-   
-   Stats.SHA1Bytes += CurStat.FileSize;
-        
-   if (Fd == NULL && OpenFile() == false)
+   if (FlHashes != 0)

    {
    {

-      return false;
-   }
-   SHA1Summation SHA1;
-   if (Fd->Seek(0) == false || SHA1.AddFD(Fd->Fd(),CurStat.FileSize) == false)
-      return false;
-   
-   SHA1Res = SHA1.Result();
-   hex2bytes(CurStat.SHA1, SHA1Res.data(), sizeof(CurStat.SHA1));
-   CurStat.Flags |= FlSHA1;
-   return true;
-}
-                                                                       /*}}}*/
-// CacheDB::GetSHA256 - Get the SHA256 hash                            /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool CacheDB::GetSHA256(bool const &GenOnly)
-{
-   // Try to read the control information out of the DB.
-   if ((CurStat.Flags & FlSHA256) == FlSHA256)
-   {
-      if (GenOnly == true)
-        return true;
+      if (OpenFile() == false)
+        return false;

 
 

-      SHA256Res = bytes2hex(CurStat.SHA256, sizeof(CurStat.SHA256));
-      return true;
-   }
-   
-   Stats.SHA256Bytes += CurStat.FileSize;
-        
-   if (Fd == NULL && OpenFile() == false)
-   {
-      return false;
-   }
-   SHA256Summation SHA256;
-   if (Fd->Seek(0) == false || SHA256.AddFD(Fd->Fd(),CurStat.FileSize) == false)
-      return false;
-   
-   SHA256Res = SHA256.Result();
-   hex2bytes(CurStat.SHA256, SHA256Res.data(), sizeof(CurStat.SHA256));
-   CurStat.Flags |= FlSHA256;
-   return true;
-}
-                                                                       /*}}}*/
-// CacheDB::GetSHA256 - Get the SHA256 hash                            /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool CacheDB::GetSHA512(bool const &GenOnly)
-{
-   // Try to read the control information out of the DB.
-   if ((CurStat.Flags & FlSHA512) == FlSHA512)
-   {
-      if (GenOnly == true)
-        return true;
+      Hashes hashes(FlHashes);
+      if (Fd->Seek(0) == false || hashes.AddFD(*Fd, CurStat.FileSize) == false)
+        return false;

 
 

-      SHA512Res = bytes2hex(CurStat.SHA512, sizeof(CurStat.SHA512));
-      return true;
-   }
-   
-   Stats.SHA512Bytes += CurStat.FileSize;
-        
-   if (Fd == NULL && OpenFile() == false)
-   {
-      return false;
+      HashStringList hl = hashes.GetHashStringList();
+      for (HashStringList::const_iterator hs = hl.begin(); hs != hl.end(); ++hs)
+      {
+        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());
+      }

    }
    }

-   SHA512Summation SHA512;
-   if (Fd->Seek(0) == false || SHA512.AddFD(Fd->Fd(),CurStat.FileSize) == false)
-      return false;
-   
-   SHA512Res = SHA512.Result();
-   hex2bytes(CurStat.SHA512, SHA512Res.data(), sizeof(CurStat.SHA512));
-   CurStat.Flags |= FlSHA512;
-   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                    /*{{{*/


@@ -457,11 +505,11 @@ bool CacheDB::Finish()
    if (CurStat.Flags == OldStat.Flags &&
        CurStat.mtime == OldStat.mtime)
       return true;
    if (CurStat.Flags == OldStat.Flags &&
        CurStat.mtime == OldStat.mtime)
       return true;

-   
+

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

-   InitQuery("st");
+   InitQueryStats();

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


@@ -494,16 +542,24 @@ bool CacheDB::Clean()
       {
          if (stringcmp(Colon + 1, (char *)Key.data+Key.size,"st") == 0 ||
              stringcmp(Colon + 1, (char *)Key.data+Key.size,"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)
         {
              stringcmp(Colon + 1, (char *)Key.data+Key.size,"cn") == 0)
         {

-            if (FileExists(string((const char *)Key.data,Colon)) == 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);
    }

-   Dbp->compact(Dbp, NULL, NULL, NULL, NULL, DB_FREE_SPACE, NULL);
+   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;
 }