* merged from main

[apt.git] / apt-pkg / deb / debrecords.cc

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index e06533e19b897593e73f48f6ec9caa5559a4e5cc..6652a6ad98945a0e83170e068894d8bdf91b327a 100644 (file)
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debrecords.cc,v 1.4 1999/01/27 02:48:53 jgg Exp $
+// $Id: debrecords.cc,v 1.10 2001/03/13 06:51:46 jgg Exp $

 /* ######################################################################
    
    Debian Package Records - Parser for debian package records
 /* ######################################################################
    
    Debian Package Records - Parser for debian package records


@@ -18,7 +18,9 @@
 // RecordParser::debRecordParser - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // RecordParser::debRecordParser - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-debRecordParser::debRecordParser(FileFd &File) : Tags(File,4*1024)
+debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : 
+                  File(FileName,FileFd::ReadOnly), 
+                  Tags(&File,Cache.Head().MaxVerFileSize + 200)

 {
 }
                                                                        /*}}}*/
 {
 }
                                                                        /*}}}*/


@@ -30,24 +32,20 @@ bool debRecordParser::Jump(pkgCache::VerFileIterator const &Ver)
    return Tags.Jump(Section,Ver->Offset);
 }
                                                                        /*}}}*/
    return Tags.Jump(Section,Ver->Offset);
 }
                                                                        /*}}}*/

-// RecordParser::FindTag - Locate a tag and return a string            /*{{{*/
+// RecordParser::FileName - Return the archive filename on the site    /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-string debRecordParser::FindTag(const char *Tag)
+string debRecordParser::FileName()

 {
 {

-   const char *Start;
-   const char *Stop;
-   if (Section.Find(Tag,Start,Stop) == false)
-      return string();
-   return string(Start,Stop - Start);
+   return Section.FindS("Filename");

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-// RecordParser::FileName - Return the archive filename on the site    /*{{{*/
+// RecordParser::Name - Return the package name                                /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-string debRecordParser::FileName()
+string debRecordParser::Name()

 {
 {

-   return FindTag("Filename");
+   return Section.FindS("Package");

 }
                                                                        /*}}}*/
 // RecordParser::MD5Hash - Return the archive hash                     /*{{{*/
 }
                                                                        /*}}}*/
 // RecordParser::MD5Hash - Return the archive hash                     /*{{{*/


@@ -55,7 +53,15 @@ string debRecordParser::FileName()
 /* */
 string debRecordParser::MD5Hash()
 {
 /* */
 string debRecordParser::MD5Hash()
 {

-   return FindTag("MD5sum");
+   return Section.FindS("MD5Sum");
+}
+                                                                       /*}}}*/
+// RecordParser::SHA1Hash - Return the archive hash                    /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SHA1Hash()
+{
+   return Section.FindS("SHA1Sum");

 }
                                                                        /*}}}*/
 // RecordParser::Maintainer - Return the maintainer email              /*{{{*/
 }
                                                                        /*}}}*/
 // RecordParser::Maintainer - Return the maintainer email              /*{{{*/


@@ -63,7 +69,7 @@ string debRecordParser::MD5Hash()
 /* */
 string debRecordParser::Maintainer()
 {
 /* */
 string debRecordParser::Maintainer()
 {

-   return FindTag("Maintainer");
+   return Section.FindS("Maintainer");

 }
                                                                        /*}}}*/
 // RecordParser::ShortDesc - Return a 1 line description               /*{{{*/
 }
                                                                        /*}}}*/
 // RecordParser::ShortDesc - Return a 1 line description               /*{{{*/


@@ -71,7 +77,7 @@ string debRecordParser::Maintainer()
 /* */
 string debRecordParser::ShortDesc()
 {
 /* */
 string debRecordParser::ShortDesc()
 {

-   string Res = FindTag("Description");
+   string Res = Section.FindS("Description");

    string::size_type Pos = Res.find('\n');
    if (Pos == string::npos)
       return Res;
    string::size_type Pos = Res.find('\n');
    if (Pos == string::npos)
       return Res;


@@ -83,6 +89,26 @@ string debRecordParser::ShortDesc()
 /* */
 string debRecordParser::LongDesc()
 {
 /* */
 string debRecordParser::LongDesc()
 {

-   return FindTag("Description");
+   return Section.FindS("Description");
+}
+                                                                       /*}}}*/
+// RecordParser::SourcePkg - Return the source package name if any     /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SourcePkg()
+{
+   string Res = Section.FindS("Source");
+   string::size_type Pos = Res.find(' ');
+   if (Pos == string::npos)
+      return Res;
+   return string(Res,0,Pos);
+}
+                                                                       /*}}}*/
+// RecordParser::GetRec - Return the whole record                      /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void debRecordParser::GetRec(const char *&Start,const char *&Stop)
+{
+   Section.GetSection(Start,Stop);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/