vendor/ubuntu/sources.list.in: whitespace fix

[apt.git] / ftparchive / writer.h

diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index e7643890056fed1c0a54c2ea2a72e044f70673da..4932b0cc8502f4a40f09262e7c986d127c6991ca 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,13 +30,13 @@ using std::cout;
 using std::endl;
 using std::vector;
 using std::map;
 using std::endl;
 using std::vector;
 using std::map;

-    
+

 class FTWScanner
 {
    protected:
    vector<string> Patterns;
 class FTWScanner
 {
    protected:
    vector<string> Patterns;

+   string Arch;

    const char *OriginalPath;
    const char *OriginalPath;

-   char *RealPath;

    bool ErrorPrinted;
    
    // Stuff for the delinker
    bool ErrorPrinted;
    
    // Stuff for the delinker


@@ -43,12 +44,12 @@ class FTWScanner
    
    static FTWScanner *Owner;
    static int ScannerFTW(const char *File,const struct stat *sb,int Flag);
    
    static FTWScanner *Owner;
    static int ScannerFTW(const char *File,const struct stat *sb,int Flag);

-   static int ScannerFile(const char *File, bool ReadLink);
+   static int ScannerFile(const char *File, bool const &ReadLink);

 
    bool Delink(string &FileName,const char *OriginalPath,
 
    bool Delink(string &FileName,const char *OriginalPath,

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

 
 

-   inline void NewLine(unsigned Priority)
+   inline void NewLine(unsigned const &Priority)

    {
       if (ErrorPrinted == false && Quiet <= Priority)
       {
    {
       if (ErrorPrinted == false && Quiet <= Priority)
       {


@@ -58,19 +59,45 @@ class FTWScanner
    }
    
    public:
    }
    
    public:

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

 
    unsigned long DeLinkLimit;
    string InternalPrefix;
 
    virtual bool DoPackage(string FileName) = 0;
 
    unsigned long DeLinkLimit;
    string InternalPrefix;
 
    virtual bool DoPackage(string FileName) = 0;

-   bool RecursiveScan(string Dir);
-   bool LoadFileList(string BaseDir,string File);
+   bool RecursiveScan(string const &Dir);
+   bool LoadFileList(string const &BaseDir,string const &File);

    void ClearPatterns() { Patterns.clear(); };
    void ClearPatterns() { Patterns.clear(); };

-   void AddPattern(string Pattern) { Patterns.push_back(Pattern); };
-   bool SetExts(string Vals);
+   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();
-   virtual ~FTWScanner() {delete [] RealPath;};
+   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


@@ -81,9 +108,7 @@ class PackagesWriter : public FTWScanner
    public:
 
    // Some flags
    public:
 
    // Some flags

-   bool DoMD5;
-   bool DoSHA1;
-   bool DoSHA256;
+   bool DoAlwaysStat;

    bool NoOverride;
    bool DoContents;
    bool LongDescription;
    bool NoOverride;
    bool DoContents;
    bool LongDescription;


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

-   string Arch;
+   TranslationWriter *TransWriter;

 
 

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

       {return Over.ReadExtraOverride(File);};
    virtual bool DoPackage(string FileName);
 
       {return Over.ReadExtraOverride(File);};
    virtual bool DoPackage(string FileName);
 

-   PackagesWriter(string DB,string Overrides,string ExtOverrides=string(),
-                 string Arch=string());
+   PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides=string(),
+                 string const &Arch=string());

    virtual ~PackagesWriter() {};
 };
 
    virtual ~PackagesWriter() {};
 };
 


@@ -121,25 +146,27 @@ class ContentsWriter : public FTWScanner
    bool DoPackage(string FileName,string Package);
    virtual bool DoPackage(string FileName) 
              {return DoPackage(FileName,string());};
    bool DoPackage(string FileName,string Package);
    virtual bool DoPackage(string FileName) 
              {return DoPackage(FileName,string());};

-   bool ReadFromPkgs(string PkgFile,string PkgCompress);
+   bool ReadFromPkgs(string const &PkgFile,string const &PkgCompress);

 
    void Finish() {Gen.Print(Output);};
 
    void Finish() {Gen.Print(Output);};

-   inline bool ReadyDB(string DB) {return Db.ReadyDB(DB);};
+   inline bool ReadyDB(string const &DB) {return Db.ReadyDB(DB);};

    
    

-   ContentsWriter(string DB);
+   ContentsWriter(string const &DB, string const &Arch = string());

    virtual ~ContentsWriter() {};
 };
 
 class SourcesWriter : public FTWScanner
 {
    virtual ~ContentsWriter() {};
 };
 
 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;


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

-   SourcesWriter(string BOverrides,string SOverrides,
-                string ExtOverrides=string());
+   SourcesWriter(string const &DB,string const &BOverrides,string const &SOverrides,
+                string const &ExtOverrides=string());

    virtual ~SourcesWriter() {free(Buffer);};
 };
 
 class ReleaseWriter : public FTWScanner
 {
 public:
    virtual ~SourcesWriter() {free(Buffer);};
 };
 
 class ReleaseWriter : public FTWScanner
 {
 public:

-   ReleaseWriter(string DB);
+   ReleaseWriter(string const &DB);

    virtual bool DoPackage(string FileName);
    void Finish();
 
    virtual bool DoPackage(string FileName);
    void Finish();
 


@@ -172,8 +199,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;