* apt-inst/contrib/arfile.cc:

[apt.git] / ftparchive / writer.h

diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index f347ca3b3793e8495c22c8c846421e4580502cff..6e161c752ac4cbeacb3f8192a5adcb7d22fd01db 100644 (file)
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: writer.h,v 1.6 2003/12/26 20:50:01 mdz Exp $
+// $Id: writer.h,v 1.4.2.2 2003/12/26 22:55:43 mdz Exp $
 /* ######################################################################
 
    Writer 
@@ -13,9 +13,6 @@
 #ifndef WRITER_H
 #define WRITER_H
 
-#ifdef __GNUG__
-#pragma interface "writer.h"
-#endif 
 
 #include <string>
 #include <stdio.h>
@@ -45,16 +42,17 @@ class FTWScanner
    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 ReadLink);
 
    bool Delink(string &FileName,const char *OriginalPath,
-              unsigned long &Bytes,struct stat &St);
+              unsigned long &Bytes,off_t FileSize);
 
    inline void NewLine(unsigned Priority)
    {
       if (ErrorPrinted == false && Quiet <= Priority)
       {
-        cout << endl;
+        c1out << endl;
         ErrorPrinted = true;
       }         
    }
@@ -67,8 +65,8 @@ class FTWScanner
    virtual bool DoPackage(string FileName) = 0;
    bool RecursiveScan(string Dir);
    bool LoadFileList(string BaseDir,string File);
-   bool ClearPatterns() { Patterns.clear(); };
-   bool AddPattern(string Pattern) { Patterns.push_back(Pattern); };
+   void ClearPatterns() { Patterns.clear(); };
+   void AddPattern(string Pattern) { Patterns.push_back(Pattern); };
    bool SetExts(string Vals);
       
    FTWScanner();
@@ -84,6 +82,8 @@ class PackagesWriter : public FTWScanner
 
    // Some flags
    bool DoMD5;
+   bool DoSHA1;
+   bool DoSHA256;
    bool NoOverride;
    bool DoContents;
 
@@ -92,13 +92,15 @@ class PackagesWriter : public FTWScanner
    string DirStrip;
    FILE *Output;
    struct CacheDB::Stats &Stats;
-   
+   string Arch;
+
    inline bool ReadOverride(string File) {return Over.ReadOverride(File);};
    inline bool ReadExtraOverride(string File) 
       {return Over.ReadExtraOverride(File);};
    virtual bool DoPackage(string FileName);
 
-   PackagesWriter(string DB,string Overrides,string ExtOverrides=string());
+   PackagesWriter(string DB,string Overrides,string ExtOverrides=string(),
+                 string Arch=string());
    virtual ~PackagesWriter() {};
 };
 
@@ -168,8 +170,10 @@ protected:
    {
       string MD5;
       string SHA1;
+      string SHA256;
       // Limited by FileFd::Size()
       unsigned long size;
+      ~CheckSum() {};
    };
    map<string,struct CheckSum> CheckSums;
 };