* buildlib/configure.mak:

[apt.git] / ftparchive / writer.h

diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index af7ba4edd5ceda709ee96ebc7143839970e2cd12..76a3dfd1e88b05cc835121b06049a14c44d0d3bd 100644 (file)
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -19,6 +19,7 @@
 #include <iostream>
 #include <vector>
 #include <map>
 #include <iostream>
 #include <vector>
 #include <map>

+#include <set>

 
 #include "cachedb.h"
 #include "override.h"
 
 #include "cachedb.h"
 #include "override.h"


@@ -29,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:


@@ -46,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)
    {


@@ -58,6 +59,10 @@ class FTWScanner
    }
    
    public:
    }
    
    public:

+   bool DoMD5;
+   bool DoSHA1;
+   bool DoSHA256;
+   bool DoSHA512;

 
    unsigned long DeLinkLimit;
    string InternalPrefix;
 
    unsigned long DeLinkLimit;
    string InternalPrefix;


@@ -67,9 +72,32 @@ class FTWScanner
    bool LoadFileList(string const &BaseDir,string const &File);
    void ClearPatterns() { Patterns.clear(); };
    void AddPattern(string const &Pattern) { Patterns.push_back(Pattern); };
    bool LoadFileList(string const &BaseDir,string const &File);
    void ClearPatterns() { Patterns.clear(); };
    void AddPattern(string const &Pattern) { Patterns.push_back(Pattern); };

+   void AddPattern(char const *Pattern) { Patterns.push_back(Pattern); };
+   void AddPatterns(std::vector<std::string> const &patterns) { Patterns.insert(Patterns.end(), patterns.begin(), patterns.end()); };

    bool SetExts(string const &Vals);
       
    FTWScanner(string const &Arch = string());
    bool SetExts(string const &Vals);
       
    FTWScanner(string const &Arch = string());

+   virtual ~FTWScanner() {};
+};
+
+class MultiCompress;
+
+class TranslationWriter
+{
+   MultiCompress *Comp;
+   FILE *Output;
+   std::set<string> Included;
+   unsigned short RefCounter;
+
+   public:
+   void IncreaseRefCounter() { ++RefCounter; };
+   unsigned short DecreaseRefCounter() { return (RefCounter == 0) ? 0 : --RefCounter; };
+   unsigned short GetRefCounter() const { return RefCounter; };
+   bool DoPackage(string const &Pkg, string const &Desc, string const &MD5);
+
+   TranslationWriter(string const &File, string const &TransCompress, mode_t const &Permissions);
+   TranslationWriter() : Comp(NULL), Output(NULL), RefCounter(0) {};
+   ~TranslationWriter();

 };
 
 class PackagesWriter : public FTWScanner
 };
 
 class PackagesWriter : public FTWScanner


@@ -80,9 +108,6 @@ class PackagesWriter : public FTWScanner
    public:
 
    // Some flags
    public:
 
    // Some flags

-   bool DoMD5;
-   bool DoSHA1;
-   bool DoSHA256;

    bool DoAlwaysStat;
    bool NoOverride;
    bool DoContents;
    bool DoAlwaysStat;
    bool NoOverride;
    bool DoContents;


@@ -93,6 +118,7 @@ class PackagesWriter : public FTWScanner
    string DirStrip;
    FILE *Output;
    struct CacheDB::Stats &Stats;
    string DirStrip;
    FILE *Output;
    struct CacheDB::Stats &Stats;

+   TranslationWriter *TransWriter;

 
    inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);};
    inline bool ReadExtraOverride(string const &File) 
 
    inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);};
    inline bool ReadExtraOverride(string const &File) 


@@ -134,7 +160,7 @@ class SourcesWriter : public FTWScanner
    Override BOver;
    Override SOver;
    char *Buffer;
    Override BOver;
    Override SOver;
    char *Buffer;

-   unsigned long BufSize;
+   unsigned long long BufSize;

    
    public:
 
    
    public:
 


@@ -171,8 +197,9 @@ protected:
       string MD5;
       string SHA1;
       string SHA256;
       string MD5;
       string SHA1;
       string SHA256;

+      string SHA512;

       // Limited by FileFd::Size()
       // Limited by FileFd::Size()

-      unsigned long size;
+      unsigned long long size;

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