enable FileFd to guess the compressor based on the filename if requested or

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

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 2aa47e3436ed9346f331d97609e8bfa387544f01..184c07c33b2d9b2f2ea47036e8824fdd76ecfe5c 100644 (file)
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -8,21 +8,26 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/debrecords.h"
-#endif
+#include <config.h>
+

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

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

 #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), 
-                  Tags(&File,Cache.Head().MaxVerFileSize + 200)
+                  File(FileName,FileFd::ReadOnly, FileFd::Extension),
+                  Tags(&File, std::max(Cache.Head().MaxVerFileSize, 
+                                      Cache.Head().MaxDescFileSize) + 200)

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


@@ -54,6 +59,14 @@ string debRecordParser::Name()
    return Section.FindS("Package");
 }
                                                                        /*}}}*/
    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                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -70,6 +83,22 @@ string debRecordParser::SHA1Hash()
    return Section.FindS("SHA1");
 }
                                                                        /*}}}*/
    return Section.FindS("SHA1");
 }
                                                                        /*}}}*/

+// RecordParser::SHA256Hash - Return the archive hash                  /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SHA256Hash()
+{
+   return Section.FindS("SHA256");
+}
+                                                                       /*}}}*/
+// RecordParser::SHA512Hash - Return the archive hash                  /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SHA512Hash()
+{
+   return Section.FindS("SHA512");
+}
+                                                                       /*}}}*/

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


@@ -78,6 +107,15 @@ string debRecordParser::Maintainer()
    return Section.FindS("Maintainer");
 }
                                                                        /*}}}*/
    return Section.FindS("Maintainer");
 }
                                                                        /*}}}*/

+// RecordParser::RecordField - Return the value of an arbitrary field       /*{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::RecordField(const char *fieldName)
+{
+   return Section.FindS(fieldName);
+}
+
+                                                                        /*}}}*/

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


@@ -96,13 +134,18 @@ string debRecordParser::ShortDesc()
 string debRecordParser::LongDesc()
 {
   string orig, dest;
 string debRecordParser::LongDesc()
 {
   string orig, dest;

-  char *codeset = nl_langinfo(CODESET);

 
   if (!Section.FindS("Description").empty())
      orig = Section.FindS("Description").c_str();
 
   if (!Section.FindS("Description").empty())
      orig = Section.FindS("Description").c_str();

-  else 
-     orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str();
+  else
+  {
+     std::vector<string> const lang = APT::Configuration::getLanguages();
+     for (std::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;
   if (strcmp(codeset,"UTF-8") != 0) {
      UTF8ToCodeset(codeset, orig, &dest);
      orig = dest;