Fix a segfault in the version merger introduced in the previous patch:

[apt.git] / apt-pkg / deb / deblistparser.h

diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 63e78a9885f6b09884344e01bfef6a45da4577a2..1c709229faa5b713d5a5d30f84a101a7ae86d4bb 100644 (file)
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: deblistparser.h,v 1.4 1998/07/12 23:58:54 jgg Exp $
+// $Id: deblistparser.h,v 1.9 2001/02/20 07:03:17 jgg Exp $

 /* ######################################################################
    
    Debian Package List Parser - This implements the abstract parser 
 /* ######################################################################
    
    Debian Package List Parser - This implements the abstract parser 


@@ -8,44 +8,50 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_DEBLISTPARSER_H
 #define PKGLIB_DEBLISTPARSER_H
 
 #include <apt-pkg/pkgcachegen.h>
 #ifndef PKGLIB_DEBLISTPARSER_H
 #define PKGLIB_DEBLISTPARSER_H
 
 #include <apt-pkg/pkgcachegen.h>

+#include <apt-pkg/indexfile.h>

 #include <apt-pkg/tagfile.h>
 
 class debListParser : public pkgCacheGenerator::ListParser
 {
 #include <apt-pkg/tagfile.h>
 
 class debListParser : public pkgCacheGenerator::ListParser
 {

-   pkgTagFile Tags;
-   pkgTagSection Section;
-   unsigned long iOffset;
-   
+   public:
+

    // Parser Helper
    struct WordList
    {
    // Parser Helper
    struct WordList
    {

-      char *Str;
+      const char *Str;

       unsigned char Val;
    };
    
       unsigned char Val;
    };
    

-   string FindTag(const char *Tag);
-   signed long FindTagI(const char *Tag,signed long Default = 0);
+   private:
+   
+   pkgTagFile Tags;
+   pkgTagSection Section;
+   unsigned long iOffset;
+   string Arch;
+   

    unsigned long UniqFindTagWrite(const char *Tag);
    unsigned long UniqFindTagWrite(const char *Tag);

-   bool HandleFlag(const char *Tag,unsigned long &Flags,unsigned long Flag);

    bool ParseStatus(pkgCache::PkgIterator Pkg,pkgCache::VerIterator Ver);
    bool ParseStatus(pkgCache::PkgIterator Pkg,pkgCache::VerIterator Ver);

-   const char *ParseDepends(const char *Start,const char *Stop,
-                           string &Package,string &Ver,unsigned int &Op);

    bool ParseDepends(pkgCache::VerIterator Ver,const char *Tag,
                     unsigned int Type);
    bool ParseProvides(pkgCache::VerIterator Ver);
    bool ParseDepends(pkgCache::VerIterator Ver,const char *Tag,
                     unsigned int Type);
    bool ParseProvides(pkgCache::VerIterator Ver);

-   bool GrabWord(string Word,WordList *List,int Count,unsigned char &Out);
+   static bool GrabWord(string Word,WordList *List,unsigned char &Out);

    
    public:
    
    public:

-   
+
+   static unsigned char GetPrio(string Str);
+      

    // These all operate against the current section
    virtual string Package();
    virtual string Version();
    virtual bool NewVersion(pkgCache::VerIterator Ver);
    // These all operate against the current section
    virtual string Package();
    virtual string Version();
    virtual bool NewVersion(pkgCache::VerIterator Ver);

+   virtual string Description();
+   virtual string DescriptionLanguage();
+   virtual MD5SumValue Description_md5();
+   virtual unsigned short VersionHash();

    virtual bool UsePackage(pkgCache::PkgIterator Pkg,
                           pkgCache::VerIterator Ver);
    virtual unsigned long Offset() {return iOffset;};
    virtual bool UsePackage(pkgCache::PkgIterator Pkg,
                           pkgCache::VerIterator Ver);
    virtual unsigned long Offset() {return iOffset;};


@@ -53,7 +59,16 @@ class debListParser : public pkgCacheGenerator::ListParser
 
    virtual bool Step();
    
 
    virtual bool Step();
    

-   debListParser(File &File);
+   bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File,
+                       string section);
+   
+   static const char *ParseDepends(const char *Start,const char *Stop,
+                           string &Package,string &Ver,unsigned int &Op,
+                           bool const &ParseArchFlags = false,
+                           bool const &StripMultiArch = false);
+   static const char *ConvertRelation(const char *I,unsigned int &Op);
+
+   debListParser(FileFd *File);

 };
 
 #endif
 };
 
 #endif