merged from david

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

diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 6b9f8ffc84772a23c6d4276119a8904b36433626..38211fb0f9ee5c0bb8450cca1a02d8732c1d667e 100644 (file)
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -25,9 +25,15 @@
 
 
 #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 <apt-pkg/pkgcache.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/md5.h>
+#endif
+
+class FileFd;

 
 class debDebFile
 {
 
 class debDebFile
 {


@@ -39,13 +45,10 @@ 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 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,7 +71,7 @@ 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);
    
    // Members from DirStream
    virtual bool DoItem(Item &Itm,int &Fd);


@@ -81,7 +84,7 @@ class debDebFile::MemControlExtract : public pkgDirStream
    bool TakeControl(const void *Data,unsigned long Size);
       
    MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
    bool TakeControl(const void *Data,unsigned long Size);
       
    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;};   
 };
                                                                        /*}}}*/