Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-inst / deb / debfile.h

diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 6b9f8ffc84772a23c6d4276119a8904b36433626..b068efceccb45a050a5df7669133ac353509e906 100644 (file)
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -25,10 +25,20 @@
 
 
 #include <apt-pkg/arfile.h>
 
 
 #include <apt-pkg/arfile.h>

-#include <apt-pkg/database.h>

 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/tagfile.h>
 
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/tagfile.h>
 

+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/md5.h>
+#endif
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/pkgcache.h>
+#endif
+
+class FileFd;
+

 class debDebFile
 {
    protected:
 class debDebFile
 {
    protected:


@@ -39,13 +49,11 @@ class debDebFile
    bool CheckMember(const char *Name);
    
    public:
    bool CheckMember(const char *Name);
    
    public:

-

    class ControlExtract;
    class MemControlExtract;
    class ControlExtract;
    class MemControlExtract;

-   
-   bool ExtractControl(pkgDataBase &DB);
+
+   bool ExtractTarMember(pkgDirStream &Stream, const char *Name);

    bool ExtractArchive(pkgDirStream &Stream);
    bool ExtractArchive(pkgDirStream &Stream);

-   pkgCache::VerIterator MergeControl(pkgDataBase &DB);

    const ARArchive::Member *GotoMember(const char *Name);
    inline FileFd &GetFile() {return File;};
    
    const ARArchive::Member *GotoMember(const char *Name);
    inline FileFd &GetFile() {return File;};
    


@@ -68,20 +76,20 @@ class debDebFile::MemControlExtract : public pkgDirStream
    char *Control;
    pkgTagSection Section;
    unsigned long Length;
    char *Control;
    pkgTagSection Section;
    unsigned long Length;

-   string Member;
+   std::string Member;

    
    // Members from DirStream
    virtual bool DoItem(Item &Itm,int &Fd);
    virtual bool Process(Item &Itm,const unsigned char *Data,
    
    // Members from DirStream
    virtual bool DoItem(Item &Itm,int &Fd);
    virtual bool Process(Item &Itm,const unsigned char *Data,

-                       unsigned long Size,unsigned long Pos);
+                       unsigned long long Size,unsigned long long Pos);

    
 
    // Helpers
    bool Read(debDebFile &Deb);
    
 
    // Helpers
    bool Read(debDebFile &Deb);

-   bool TakeControl(const void *Data,unsigned long Size);
+   bool TakeControl(const void *Data,unsigned long long Size);

       
    MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
       
    MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};

-   MemControlExtract(string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
+   MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};

    ~MemControlExtract() {delete [] Control;};   
 };
                                                                        /*}}}*/
    ~MemControlExtract() {delete [] Control;};   
 };
                                                                        /*}}}*/