Merge branch 'debian/sid' into debian/experimental

[apt.git] / ftparchive / writer.h

diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index c6026e954ea133ac8bb878f52cbbea2446d0d032..4932b0cc8502f4a40f09262e7c986d127c6991ca 100644 (file)
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -22,7 +22,6 @@
 #include <set>
 
 #include "cachedb.h"
 #include <set>
 
 #include "cachedb.h"

-#include "multicompress.h"

 #include "override.h"
 #include "apt-ftparchive.h"
 
 #include "override.h"
 #include "apt-ftparchive.h"
 


@@ -31,7 +30,7 @@ using std::cout;
 using std::endl;
 using std::vector;
 using std::map;
 using std::endl;
 using std::vector;
 using std::map;

-    
+

 class FTWScanner
 {
    protected:
 class FTWScanner
 {
    protected:


@@ -48,7 +47,7 @@ class FTWScanner
    static int ScannerFile(const char *File, bool const &ReadLink);
 
    bool Delink(string &FileName,const char *OriginalPath,
    static int ScannerFile(const char *File, bool const &ReadLink);
 
    bool Delink(string &FileName,const char *OriginalPath,

-              unsigned long &Bytes,off_t const &FileSize);
+              unsigned long long &Bytes,unsigned long long const &FileSize);

 
    inline void NewLine(unsigned const &Priority)
    {
 
    inline void NewLine(unsigned const &Priority)
    {


@@ -81,6 +80,8 @@ class FTWScanner
    virtual ~FTWScanner() {};
 };
 
    virtual ~FTWScanner() {};
 };
 

+class MultiCompress;
+

 class TranslationWriter
 {
    MultiCompress *Comp;
 class TranslationWriter
 {
    MultiCompress *Comp;


@@ -156,14 +157,16 @@ class ContentsWriter : public FTWScanner
 
 class SourcesWriter : public FTWScanner
 {
 
 class SourcesWriter : public FTWScanner
 {

+   CacheDB Db;

    Override BOver;
    Override SOver;
    char *Buffer;
    Override BOver;
    Override SOver;
    char *Buffer;

-   unsigned long BufSize;
+   unsigned long long BufSize;

    
    public:
 
    bool NoOverride;
    
    public:
 
    bool NoOverride;

+   bool DoAlwaysStat;

    
    // General options
    string PathPrefix;
    
    // General options
    string PathPrefix;


@@ -173,7 +176,7 @@ class SourcesWriter : public FTWScanner
 
    virtual bool DoPackage(string FileName);
 
 
    virtual bool DoPackage(string FileName);
 

-   SourcesWriter(string const &BOverrides,string const &SOverrides,
+   SourcesWriter(string const &DB,string const &BOverrides,string const &SOverrides,

                 string const &ExtOverrides=string());
    virtual ~SourcesWriter() {free(Buffer);};
 };
                 string const &ExtOverrides=string());
    virtual ~SourcesWriter() {free(Buffer);};
 };


@@ -198,7 +201,7 @@ protected:
       string SHA256;
       string SHA512;
       // Limited by FileFd::Size()
       string SHA256;
       string SHA512;
       // Limited by FileFd::Size()

-      unsigned long size;
+      unsigned long long size;

       ~CheckSum() {};
    };
    map<string,struct CheckSum> CheckSums;
       ~CheckSum() {};
    };
    map<string,struct CheckSum> CheckSums;