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

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

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index b3f91a8403fc24573ed63d20957610ba24e1e2fc..5b8538a4676676ec1c950bece01578809d7b29af 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.5 1999/02/22 03:30:06 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


@@ -8,18 +8,19 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/debrecords.h"
-#endif

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

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

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

+#include <apt-pkg/aptconfiguration.h>
+#include <langinfo.h>

                                                                        /*}}}*/
 
 // RecordParser::debRecordParser - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
                                                                        /*}}}*/
 
 // RecordParser::debRecordParser - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

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


@@ -29,26 +30,34 @@ debRecordParser::debRecordParser(FileFd &File,pkgCache &Cache) :
 bool debRecordParser::Jump(pkgCache::VerFileIterator const &Ver)
 {
    return Tags.Jump(Section,Ver->Offset);
 bool debRecordParser::Jump(pkgCache::VerFileIterator const &Ver)
 {
    return Tags.Jump(Section,Ver->Offset);

+}
+bool debRecordParser::Jump(pkgCache::DescFileIterator const &Desc)
+{
+   return Tags.Jump(Section,Desc->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::Homepage - Return the package homepage                        /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::Homepage()
+{
+   return Section.FindS("Homepage");

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


@@ -56,7 +65,23 @@ 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("SHA1");
+}
+                                                                       /*}}}*/
+// RecordParser::SHA1Hash - Return the archive hash                    /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SHA256Hash()
+{
+   return Section.FindS("SHA256");

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


@@ -64,7 +89,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               /*{{{*/


@@ -72,7 +97,7 @@ string debRecordParser::Maintainer()
 /* */
 string debRecordParser::ShortDesc()
 {
 /* */
 string debRecordParser::ShortDesc()
 {

-   string Res = FindTag("Description");
+   string Res = LongDesc();

    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;


@@ -84,6 +109,70 @@ string debRecordParser::ShortDesc()
 /* */
 string debRecordParser::LongDesc()
 {
 /* */
 string debRecordParser::LongDesc()
 {

-   return FindTag("Description");
+  string orig, dest;
+
+  if (!Section.FindS("Description").empty())
+     orig = Section.FindS("Description").c_str();
+  else
+  {
+     vector<string> const lang = APT::Configuration::getLanguages();
+     for (vector<string>::const_iterator l = lang.begin();
+         orig.empty() && l != lang.end(); l++)
+       orig = Section.FindS(string("Description-").append(*l).c_str());
+  }
+
+  char const * const codeset = nl_langinfo(CODESET);
+  if (strcmp(codeset,"UTF-8") != 0) {
+     UTF8ToCodeset(codeset, orig, &dest);
+     orig = dest;
+   }    
+  
+   return orig;
+}
+                                                                       /*}}}*/
+
+static const char *SourceVerSeparators = " ()";
+
+// RecordParser::SourcePkg - Return the source package name if any     /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SourcePkg()
+{
+   string Res = Section.FindS("Source");
+   string::size_type Pos = Res.find_first_of(SourceVerSeparators);
+   if (Pos == string::npos)
+      return Res;
+   return string(Res,0,Pos);
+}
+                                                                       /*}}}*/
+// RecordParser::SourceVer - Return the source version number if present       /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SourceVer()
+{
+   string Pkg = Section.FindS("Source");
+   string::size_type Pos = Pkg.find_first_of(SourceVerSeparators);
+   if (Pos == string::npos)
+      return "";
+
+   string::size_type VerStart = Pkg.find_first_not_of(SourceVerSeparators, Pos);
+   if(VerStart == string::npos)
+     return "";
+
+   string::size_type VerEnd = Pkg.find_first_of(SourceVerSeparators, VerStart);
+   if(VerEnd == string::npos)
+     // Corresponds to the case of, e.g., "foo (1.2" without a closing
+     // paren.  Be liberal and guess what it means.
+     return string(Pkg, VerStart);
+   else
+     return string(Pkg, VerStart, VerEnd - VerStart);
+}
+                                                                       /*}}}*/
+// RecordParser::GetRec - Return the whole record                      /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void debRecordParser::GetRec(const char *&Start,const char *&Stop)
+{
+   Section.GetSection(Start,Stop);

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