Fix debListParser to accept "no" as a value for the Multi-Arch field

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

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 34ef0d8f25801e5c7f44804dab85a3c14d5607b2..d2c04d8b281d29caaa7f71254f2ee7ca5d0ccfa8 100644 (file)
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -8,18 +8,30 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

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

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

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

+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/tagfile.h>
+
+#include <string.h>
+#include <algorithm>
+#include <string>
+#include <vector>

 #include <langinfo.h>
                                                                        /*}}}*/
 
 #include <langinfo.h>
                                                                        /*}}}*/
 

+using std::string;
+

 // RecordParser::debRecordParser - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : 
 // RecordParser::debRecordParser - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : 

-                  File(FileName,FileFd::ReadOnly), 
+                  File(FileName,FileFd::ReadOnly, FileFd::Extension),

                   Tags(&File, std::max(Cache.Head().MaxVerFileSize, 
                                       Cache.Head().MaxDescFileSize) + 200)
 {
                   Tags(&File, std::max(Cache.Head().MaxVerFileSize, 
                                       Cache.Head().MaxDescFileSize) + 200)
 {


@@ -61,45 +73,45 @@ string debRecordParser::Homepage()
    return Section.FindS("Homepage");
 }
                                                                        /*}}}*/
    return Section.FindS("Homepage");
 }
                                                                        /*}}}*/

-// RecordParser::MD5Hash - Return the archive hash                     /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debRecordParser::MD5Hash()
-{
-   return Section.FindS("MD5Sum");
-}
-                                                                       /*}}}*/
-// RecordParser::SHA1Hash - Return the archive hash                    /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debRecordParser::SHA1Hash()
+// RecordParser::Hashes - return the available archive hashes          /*{{{*/
+HashStringList debRecordParser::Hashes() const

 {
 {

-   return Section.FindS("SHA1");
+   HashStringList hashes;
+   for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
+   {
+      std::string const hash = Section.FindS(*type);
+      if (hash.empty() == false)
+        hashes.push_back(HashString(*type, hash));
+   }
+   return hashes;

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

-// RecordParser::SHA1Hash - Return the archive hash                    /*{{{*/
+// RecordParser::Maintainer - Return the maintainer email              /*{{{*/

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

-string debRecordParser::SHA256Hash()
+string debRecordParser::Maintainer()

 {
 {

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

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

-// RecordParser::Maintainer - Return the maintainer email              /*{{{*/
+// RecordParser::RecordField - Return the value of an arbitrary field       /*{{*/

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

-string debRecordParser::Maintainer()
+string debRecordParser::RecordField(const char *fieldName)

 {
 {

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

 }
 }

-                                                                       /*}}}*/
+
+                                                                        /*}}}*/

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

-string debRecordParser::ShortDesc()
+string debRecordParser::ShortDesc(std::string const &lang)

 {
 {

-   string Res = LongDesc();
-   string::size_type Pos = Res.find('\n');
+   string const Res = LongDesc(lang);
+   if (Res.empty() == true)
+      return "";
+   string::size_type const Pos = Res.find('\n');

    if (Pos == string::npos)
       return Res;
    return string(Res,0,Pos);
    if (Pos == string::npos)
       return Res;
    return string(Res,0,Pos);


@@ -108,26 +120,44 @@ string debRecordParser::ShortDesc()
 // RecordParser::LongDesc - Return a longer description                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // RecordParser::LongDesc - Return a longer description                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-string debRecordParser::LongDesc()
+string debRecordParser::LongDesc(std::string const &lang)

 {
 {

-  string orig, dest;
+   string orig;
+   if (lang.empty() == true)
+   {
+      std::vector<string> const lang = APT::Configuration::getLanguages();
+      for (std::vector<string>::const_iterator l = lang.begin();
+           l != lang.end(); ++l)
+      {
+        std::string const tagname = "Description-" + *l;
+        orig = Section.FindS(tagname.c_str());
+        if (orig.empty() == false)
+           break;
+        else if (*l == "en")
+        {
+           orig = Section.FindS("Description");
+           if (orig.empty() == false)
+              break;
+        }
+      }
+      if (orig.empty() == true)
+        orig = Section.FindS("Description");
+   }
+   else
+   {
+      std::string const tagname = "Description-" + lang;
+      orig = Section.FindS(tagname.c_str());
+      if (orig.empty() == true && lang == "en")
+        orig = Section.FindS("Description");
+   }

 
 

-  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) {
+      string dest;
+      UTF8ToCodeset(codeset, orig, &dest);
+      return dest;
+   }

 
 

-  char const * const codeset = nl_langinfo(CODESET);
-  if (strcmp(codeset,"UTF-8") != 0) {
-     UTF8ToCodeset(codeset, orig, &dest);
-     orig = dest;
-   }    
-  

    return orig;
 }
                                                                        /*}}}*/
    return orig;
 }
                                                                        /*}}}*/