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 3796f79f6de18b9f8ed8da3d9ef88ed984c7b29d..ea4c66da486e959bd58b972a01b2d10c6e0916c5 100644 (file)
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -13,6 +13,7 @@
 #ifndef WRITER_H
 #define WRITER_H
 
 #ifndef WRITER_H
 #define WRITER_H
 

+#include <apt-pkg/hashes.h>

 
 #include <string>
 #include <stdio.h>
 
 #include <string>
 #include <stdio.h>


@@ -20,9 +21,11 @@
 #include <vector>
 #include <map>
 #include <set>
 #include <vector>
 #include <map>
 #include <set>

+#include <stdlib.h>
+#include <sys/types.h>

 
 

+#include "contents.h"

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

-#include "multicompress.h"

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


@@ -31,24 +34,25 @@ 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;
    string Arch;
 class FTWScanner
 {
    protected:
    vector<string> Patterns;
    string Arch;

+   bool IncludeArchAll;

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

-   
+

    // Stuff for the delinker
    bool NoLinkAct;
    // Stuff for the delinker
    bool NoLinkAct;

-   
+

    static FTWScanner *Owner;
    static int ScannerFTW(const char *File,const struct stat *sb,int Flag);
    static int ScannerFile(const char *File, bool const &ReadLink);
 
    bool Delink(string &FileName,const char *OriginalPath,
    static FTWScanner *Owner;
    static int ScannerFTW(const char *File,const struct stat *sb,int Flag);
    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)
    {


@@ -56,10 +60,13 @@ class FTWScanner
       {
         c1out << endl;
         ErrorPrinted = true;
       {
         c1out << endl;
         ErrorPrinted = true;

-      }         
+      }

    }
    }

-   
+

    public:
    public:

+   FileFd *Output;
+   bool OwnsOutput;
+   unsigned int DoHashes;

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


@@ -72,26 +79,23 @@ class FTWScanner
    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);
    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());
-   virtual ~FTWScanner() {};
+
+   FTWScanner(FileFd * const Output, string const &Arch = string(), bool const IncludeArchAll = true);
+   virtual ~FTWScanner();

 };
 
 };
 

+class MultiCompress;
+

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

-   FILE *Output;

    std::set<string> Included;
    std::set<string> Included;

-   unsigned short RefCounter;
+   FileFd *Output;

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

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


@@ -99,13 +103,10 @@ class PackagesWriter : public FTWScanner
 {
    Override Over;
    CacheDB Db;
 {
    Override Over;
    CacheDB Db;

-      
+

    public:
 
    // Some flags
    public:
 
    // Some flags

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

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


@@ -114,65 +115,68 @@ class PackagesWriter : public FTWScanner
    // General options
    string PathPrefix;
    string DirStrip;
    // General options
    string PathPrefix;
    string DirStrip;

-   FILE *Output;

    struct CacheDB::Stats &Stats;
    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);
-
-   PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides=string(),
-                 string const &Arch=string());
-   virtual ~PackagesWriter() {};
+   virtual bool DoPackage(string FileName) APT_OVERRIDE;
+
+   PackagesWriter(FileFd * const Output, TranslationWriter * const TransWriter, string const &DB,
+                  string const &Overrides,
+                  string const &ExtOverrides = "",
+                 string const &Arch = "",
+                 bool const IncludeArchAll = true);
+   virtual ~PackagesWriter();

 };
 
 class ContentsWriter : public FTWScanner
 {
    CacheDB Db;
 };
 
 class ContentsWriter : public FTWScanner
 {
    CacheDB Db;

-   
+

    GenContents Gen;
    GenContents Gen;

-   
+

    public:
 
    // General options
    public:
 
    // General options

-   FILE *Output;

    struct CacheDB::Stats &Stats;
    string Prefix;
    struct CacheDB::Stats &Stats;
    string Prefix;

-   
+

    bool DoPackage(string FileName,string Package);
    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);
 
              {return DoPackage(FileName,string());};
    bool ReadFromPkgs(string const &PkgFile,string const &PkgCompress);
 

-   void Finish() {Gen.Print(Output);};
+   void Finish() {Gen.Print(*Output);};

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

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

    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;
    string DirStrip;
    // General options
    string PathPrefix;
    string DirStrip;

-   FILE *Output;
-   struct CacheDB::Stats Stats;
+   struct CacheDB::Stats &Stats;

 
 

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

 
 

-   SourcesWriter(string const &BOverrides,string const &SOverrides,
+   SourcesWriter(FileFd * const Output, 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);};
 };


@@ -180,25 +184,22 @@ class SourcesWriter : public FTWScanner
 class ReleaseWriter : public FTWScanner
 {
 public:
 class ReleaseWriter : public FTWScanner
 {
 public:

-   ReleaseWriter(string const &DB);
-   virtual bool DoPackage(string FileName);
+   ReleaseWriter(FileFd * const Output, string const &DB);
+   virtual bool DoPackage(string FileName) APT_OVERRIDE;

    void Finish();
 
    void Finish();
 

-   FILE *Output;

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

-protected:

    struct CheckSum
    {
    struct CheckSum
    {

-      string MD5;
-      string SHA1;
-      string SHA256;
+      HashStringList Hashes;

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

-      unsigned long size;
+      unsigned long long size;

       ~CheckSum() {};
    };
       ~CheckSum() {};
    };

+protected:

    map<string,struct CheckSum> CheckSums;
 };
 
    map<string,struct CheckSum> CheckSums;
 };