add missing "free(buffer) for allocated buffer

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

diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index e09a57f3cae555d3513027578beb52457832db74..5d2a67f4f599643a18791dbae4bc59666e7c41ff 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debsrcrecords.h,v 1.4 1999/10/18 03:44:39 jgg Exp $
+// $Id: debsrcrecords.h,v 1.8 2004/03/17 05:58:54 mdz Exp $

 /* ######################################################################
    
    Debian Source Package Records - Parser implementation for Debian style
 /* ######################################################################
    
    Debian Source Package Records - Parser implementation for Debian style


@@ -11,45 +11,48 @@
 #ifndef PKGLIB_DEBSRCRECORDS_H
 #define PKGLIB_DEBSRCRECORDS_H
 
 #ifndef PKGLIB_DEBSRCRECORDS_H
 #define PKGLIB_DEBSRCRECORDS_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/debsrcrecords.h"
-#endif 

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

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

 
 class debSrcRecordParser : public pkgSrcRecords::Parser
 {
 
 class debSrcRecordParser : public pkgSrcRecords::Parser
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
+   FileFd Fd;

    pkgTagFile Tags;
    pkgTagSection Sect;
    pkgTagFile Tags;
    pkgTagSection Sect;

-   char Buffer[10000];
-   const char *StaticBinList[400];
+   std::vector<const char*> StaticBinList;

    unsigned long iOffset;
    unsigned long iOffset;

+   char *Buffer;

    
    public:
 
    virtual bool Restart() {return Tags.Jump(Sect,0);};
    virtual bool Step() {iOffset = Tags.Offset(); return Tags.Step(Sect);};
    
    public:
 
    virtual bool Restart() {return Tags.Jump(Sect,0);};
    virtual bool Step() {iOffset = Tags.Offset(); return Tags.Step(Sect);};

-   virtual bool Jump(unsigned long Off) {iOffset = Off; return Tags.Jump(Sect,Off);};
+   virtual bool Jump(unsigned long const &Off) {iOffset = Off; return Tags.Jump(Sect,Off);};

 
 

-   virtual string Package() {return Sect.FindS("Package");};
-   virtual string Version() {return Sect.FindS("Version");};
-   virtual string Maintainer() {return Sect.FindS("Maintainer");};
-   virtual string Section() {return Sect.FindS("Section");};
+   virtual std::string Package() const {return Sect.FindS("Package");};
+   virtual std::string Version() const {return Sect.FindS("Version");};
+   virtual std::string Maintainer() const {return Sect.FindS("Maintainer");};
+   virtual std::string Section() const {return Sect.FindS("Section");};

    virtual const char **Binaries();
    virtual const char **Binaries();

+   virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true);

    virtual unsigned long Offset() {return iOffset;};
    virtual unsigned long Offset() {return iOffset;};

-   virtual unsigned long Length() {return Sec.size();};
-   virtual string AsStr() 
+   virtual std::string AsStr() 

    {
    {

-      const char *Start,Stop;
+      const char *Start=0,*Stop=0;

       Sect.GetSection(Start,Stop);
       Sect.GetSection(Start,Stop);

-      return string(Start,Stop);
+      return std::string(Start,Stop);

    };
    };

-   virtual bool Files(vector<pkgSrcRecords::File> &F);
-   
-   debSrcRecordParser(FileFd *File,pkgSourceList::const_iterator SrcItem) : 
-                   Parser(File,SrcItem),
-                   Tags(*File,sizeof(Buffer)) {};
+   virtual bool Files(std::vector<pkgSrcRecords::File> &F);
+
+   debSrcRecordParser(std::string const &File,pkgIndexFile const *Index) 
+      : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400), 
+        Buffer(NULL) {}
+   virtual ~debSrcRecordParser();

 };
 
 #endif
 };
 
 #endif