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 854d3424bef0ef9c0728ae3c3ee8b69ca8753c28..af7ba4edd5ceda709ee96ebc7143839970e2cd12 100644 (file)
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: writer.h,v 1.4 2001/06/26 02:50:27 jgg Exp $
+// $Id: writer.h,v 1.4.2.2 2003/12/26 22:55:43 mdz Exp $

 /* ######################################################################
 
    Writer 
 /* ######################################################################
 
    Writer 


@@ -13,14 +13,12 @@
 #ifndef WRITER_H
 #define WRITER_H
 
 #ifndef WRITER_H
 #define WRITER_H
 

-#ifdef __GNUG__
-#pragma interface "writer.h"
-#endif 

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

+#include <map>

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


@@ -29,31 +27,32 @@
 using std::string;
 using std::cout;
 using std::endl;
 using std::string;
 using std::cout;
 using std::endl;

+using std::vector;
+using std::map;

     
 class FTWScanner
 {
    protected:
     
 class FTWScanner
 {
    protected:

-
-   char *TmpExt;
-   const char *Ext[10];
+   vector<string> Patterns;
+   string Arch;

    const char *OriginalPath;
    const char *OriginalPath;

-   char *RealPath;

    bool ErrorPrinted;
    
    // Stuff for the delinker
    bool NoLinkAct;
    
    static FTWScanner *Owner;
    bool ErrorPrinted;
    
    // Stuff for the delinker
    bool NoLinkAct;
    
    static FTWScanner *Owner;

-   static int Scanner(const char *File,const struct stat *sb,int Flag);
+   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,
 
    bool Delink(string &FileName,const char *OriginalPath,

-              unsigned long &Bytes,struct stat &St);
+              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;
       }         
    }


@@ -64,12 +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 SetExts(string Vals);
+   bool RecursiveScan(string const &Dir);
+   bool LoadFileList(string const &BaseDir,string const &File);
+   void ClearPatterns() { Patterns.clear(); };
+   void AddPattern(string const &Pattern) { Patterns.push_back(Pattern); };
+   bool SetExts(string const &Vals);

       
       

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

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


@@ -81,21 +81,26 @@ class PackagesWriter : public FTWScanner
 
    // Some flags
    bool DoMD5;
 
    // Some flags
    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;

-   
-   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());
+   PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides=string(),
+                 string const &Arch=string());

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


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


@@ -143,10 +148,34 @@ 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);};
 };
 
    virtual ~SourcesWriter() {free(Buffer);};
 };
 

+class ReleaseWriter : public FTWScanner
+{
+public:
+   ReleaseWriter(string const &DB);
+   virtual bool DoPackage(string FileName);
+   void Finish();
+
+   FILE *Output;
+   // General options
+   string PathPrefix;
+   string DirStrip;
+
+protected:
+   struct CheckSum
+   {
+      string MD5;
+      string SHA1;
+      string SHA256;
+      // Limited by FileFd::Size()
+      unsigned long size;
+      ~CheckSum() {};
+   };
+   map<string,struct CheckSum> CheckSums;
+};

 
 #endif
 
 #endif