Do not buffer writes larger than the buffer if possible

[apt.git] / ftparchive / writer.h

diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index 0ba60db5e646587fc2ebe64f93670b47e112b979..ea4c66da486e959bd58b972a01b2d10c6e0916c5 100644 (file)
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -40,6 +40,7 @@ class FTWScanner
    protected:
    vector<string> Patterns;
    string Arch;
    protected:
    vector<string> Patterns;
    string Arch;

+   bool IncludeArchAll;

    const char *OriginalPath;
    bool ErrorPrinted;
 
    const char *OriginalPath;
    bool ErrorPrinted;
 


@@ -64,6 +65,7 @@ class FTWScanner
 
    public:
    FileFd *Output;
 
    public:
    FileFd *Output;

+   bool OwnsOutput;

    unsigned int DoHashes;
 
    unsigned long DeLinkLimit;
    unsigned int DoHashes;
 
    unsigned long DeLinkLimit;


@@ -78,8 +80,8 @@ class FTWScanner
    void AddPatterns(std::vector<std::string> const &patterns) { Patterns.insert(Patterns.end(), patterns.begin(), patterns.end()); };
    bool SetExts(string const &Vals);
 
    void AddPatterns(std::vector<std::string> const &patterns) { Patterns.insert(Patterns.end(), patterns.begin(), patterns.end()); };
    bool SetExts(string const &Vals);
 

-   FTWScanner(FileFd * const Output, string const &Arch = string());
-   virtual ~FTWScanner() {};
+   FTWScanner(FileFd * const Output, string const &Arch = string(), bool const IncludeArchAll = true);
+   virtual ~FTWScanner();

 };
 
 class MultiCompress;
 };
 
 class MultiCompress;


@@ -88,17 +90,12 @@ class TranslationWriter
 {
    MultiCompress *Comp;
    std::set<string> Included;
 {
    MultiCompress *Comp;
    std::set<string> Included;

-   unsigned short RefCounter;

    FileFd *Output;
 
    public:
    FileFd *Output;
 
    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);
    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), RefCounter(0) {};

    ~TranslationWriter();
 };
 
    ~TranslationWriter();
 };
 


@@ -119,18 +116,19 @@ class PackagesWriter : public FTWScanner
    string PathPrefix;
    string DirStrip;
    struct CacheDB::Stats &Stats;
    string PathPrefix;
    string DirStrip;
    struct CacheDB::Stats &Stats;

-   TranslationWriter *TransWriter;
+   TranslationWriter * const TransWriter;

 
    inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);};
    inline bool ReadExtraOverride(string const &File) 
       {return Over.ReadExtraOverride(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);
+   virtual bool DoPackage(string FileName) APT_OVERRIDE;

 
 

-   PackagesWriter(FileFd * const Output, string const &DB,
+   PackagesWriter(FileFd * const Output, TranslationWriter * const TransWriter, string const &DB,

                   string const &Overrides,
                   string const &ExtOverrides = "",
                   string const &Overrides,
                   string const &ExtOverrides = "",

-                 string const &Arch = "");
-   virtual ~PackagesWriter() {};
+                 string const &Arch = "",
+                 bool const IncludeArchAll = true);
+   virtual ~PackagesWriter();

 };
 
 class ContentsWriter : public FTWScanner
 };
 
 class ContentsWriter : public FTWScanner


@@ -146,14 +144,15 @@ class ContentsWriter : public FTWScanner
    string Prefix;
 
    bool DoPackage(string FileName,string Package);
    string Prefix;
 
    bool DoPackage(string FileName,string Package);

-   virtual bool DoPackage(string FileName) 
+   virtual bool DoPackage(string FileName) APT_OVERRIDE 

              {return DoPackage(FileName,string());};
    bool ReadFromPkgs(string const &PkgFile,string const &PkgCompress);
 
    void Finish() {Gen.Print(*Output);};
    inline bool ReadyDB(string const &DB) {return Db.ReadyDB(DB);};
 
              {return DoPackage(FileName,string());};
    bool ReadFromPkgs(string const &PkgFile,string const &PkgCompress);
 
    void Finish() {Gen.Print(*Output);};
    inline bool ReadyDB(string const &DB) {return Db.ReadyDB(DB);};
 

-   ContentsWriter(FileFd * const Output, string const &DB, string const &Arch = string());
+   ContentsWriter(FileFd * const Output, string const &DB, string const &Arch = string(),
+        bool const IncludeArchAll = true);

    virtual ~ContentsWriter() {};
 };
 
    virtual ~ContentsWriter() {};
 };
 


@@ -175,7 +174,7 @@ class SourcesWriter : public FTWScanner
    string DirStrip;
    struct CacheDB::Stats &Stats;
 
    string DirStrip;
    struct CacheDB::Stats &Stats;
 

-   virtual bool DoPackage(string FileName);
+   virtual bool DoPackage(string FileName) APT_OVERRIDE;

 
    SourcesWriter(FileFd * const Output, string const &DB,string const &BOverrides,string const &SOverrides,
                 string const &ExtOverrides=string());
 
    SourcesWriter(FileFd * const Output, string const &DB,string const &BOverrides,string const &SOverrides,
                 string const &ExtOverrides=string());


@@ -186,7 +185,7 @@ class ReleaseWriter : public FTWScanner
 {
 public:
    ReleaseWriter(FileFd * const Output, string const &DB);
 {
 public:
    ReleaseWriter(FileFd * const Output, string const &DB);

-   virtual bool DoPackage(string FileName);
+   virtual bool DoPackage(string FileName) APT_OVERRIDE;

    void Finish();
 
    // General options
    void Finish();
 
    // General options