test-indexes.sh: Add source related tests, which uncovers two regressions

[apt.git] / ftparchive / writer.h

diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index a4e4356f925febe67e72a3db83aa09b3795b1ad4..af7ba4edd5ceda709ee96ebc7143839970e2cd12 100644 (file)
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -34,8 +34,8 @@ class FTWScanner
 {
    protected:
    vector<string> Patterns;
 {
    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,16 +43,16 @@ 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 &Bytes,off_t const &FileSize);

 
 

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

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

-        cout << endl;
+        c1out << endl;

         ErrorPrinted = true;
       }         
    }
         ErrorPrinted = true;
       }         
    }


@@ -63,14 +63,13 @@ class FTWScanner
    string InternalPrefix;
 
    virtual bool DoPackage(string FileName) = 0;
    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); };
+   bool SetExts(string const &Vals);

       
       

-   FTWScanner();
-   virtual ~FTWScanner() {delete [] RealPath;};
+   FTWScanner(string const &Arch = string());

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


@@ -84,23 +83,24 @@ class PackagesWriter : public FTWScanner
    bool DoMD5;
    bool DoSHA1;
    bool DoSHA256;
    bool DoMD5;
    bool DoSHA1;
    bool DoSHA256;

+   bool DoAlwaysStat;

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

+   bool LongDescription;

 
    // General options
    string PathPrefix;
    string DirStrip;
    FILE *Output;
    struct CacheDB::Stats &Stats;
 
    // General options
    string PathPrefix;
    string DirStrip;
    FILE *Output;
    struct CacheDB::Stats &Stats;

-   string Arch;

 
 

-   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() {};
 };
 


@@ -120,12 +120,12 @@ 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() {};
 };
 
    virtual ~ContentsWriter() {};
 };
 


@@ -148,15 +148,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 &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();