Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / indexrecords.cc

diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index 3bde7437d9944a1c6c4dd2fb312833673f68ae49..6d89949a092d89fd1fea98536b0f3f408cdd6daf 100644 (file)
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -3,16 +3,25 @@
 // $Id: indexrecords.cc,v 1.1.2.4 2003/12/30 02:11:43 mdz Exp $
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 // $Id: indexrecords.cc,v 1.1.2.4 2003/12/30 02:11:43 mdz Exp $
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include<config.h>
+

 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>

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

 #include <sys/stat.h>
 #include <clocale>
 
 #include <sys/stat.h>
 #include <clocale>
 

+#include <apti18n.h>

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

+
+using std::string;
+

 string indexRecords::GetDist() const
 {
    return this->Dist;
 string indexRecords::GetDist() const
 {
    return this->Dist;


@@ -36,13 +45,24 @@ time_t indexRecords::GetValidUntil() const
 
 const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
 {
 
 const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
 {

-   return Entries[MetaKey];
+   std::map<std::string, indexRecords::checkSum* >::const_iterator sum = Entries.find(MetaKey);
+   if (sum == Entries.end())
+      return NULL;
+   return sum->second;
+}
+
+bool indexRecords::Exists(string const &MetaKey) const
+{
+   return Entries.count(MetaKey) == 1;

 }
 
 bool indexRecords::Load(const string Filename)                         /*{{{*/
 {
 }
 
 bool indexRecords::Load(const string Filename)                         /*{{{*/
 {

-   FileFd Fd(Filename, FileFd::ReadOnly);
-   pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX
+   FileFd Fd;
+   if (OpenMaybeClearSignedFile(Filename, Fd) == false)
+      return false;
+
+   pkgTagFile TagFile(&Fd);

    if (_error->PendingError() == true)
    {
       strprintf(ErrorText, _("Unable to parse Release file %s"),Filename.c_str());
    if (_error->PendingError() == true)
    {
       strprintf(ErrorText, _("Unable to parse Release file %s"),Filename.c_str());


@@ -50,15 +70,13 @@ bool indexRecords::Load(const string Filename)                              /*{{{*/
    }
 
    pkgTagSection Section;
    }
 
    pkgTagSection Section;

+   const char *Start, *End;

    if (TagFile.Step(Section) == false)
    {
       strprintf(ErrorText, _("No sections in Release file %s"), Filename.c_str());
       return false;
    }
 
    if (TagFile.Step(Section) == false)
    {
       strprintf(ErrorText, _("No sections in Release file %s"), Filename.c_str());
       return false;
    }
 

-   const char *Start, *End;
-   Section.Get (Start, End, 0);
-

    Suite = Section.FindS("Suite");
    Dist = Section.FindS("Codename");
 
    Suite = Section.FindS("Suite");
    Dist = Section.FindS("Codename");
 


@@ -70,7 +88,7 @@ bool indexRecords::Load(const string Filename)                                /*{{{*/
 
       string Name;
       string Hash;
 
       string Name;
       string Hash;

-      size_t Size;
+      unsigned long long Size;

       while (Start < End)
       {
         if (!parseSumData(Start, End, Name, Hash, Size))
       while (Start < End)
       {
         if (!parseSumData(Start, End, Name, Hash, Size))


@@ -105,10 +123,14 @@ bool indexRecords::Load(const string Filename)                            /*{{{*/
    }
    // get the user settings for this archive and use what expires earlier
    int MaxAge = _config->FindI("Acquire::Max-ValidTime", 0);
    }
    // get the user settings for this archive and use what expires earlier
    int MaxAge = _config->FindI("Acquire::Max-ValidTime", 0);

-   if (Label.empty() == true)
+   if (Label.empty() == false)

       MaxAge = _config->FindI(string("Acquire::Max-ValidTime::" + Label).c_str(), MaxAge);
       MaxAge = _config->FindI(string("Acquire::Max-ValidTime::" + Label).c_str(), MaxAge);

+   int MinAge = _config->FindI("Acquire::Min-ValidTime", 0);
+   if (Label.empty() == false)
+      MinAge = _config->FindI(string("Acquire::Min-ValidTime::" + Label).c_str(), MinAge);

 
 

-   if(MaxAge == 0) // No user settings, use the one from the Release file
+   if(MaxAge == 0 &&
+      (MinAge == 0 || ValidUntil == 0)) // No user settings, use the one from the Release file

       return true;
 
    time_t date;
       return true;
 
    time_t date;


@@ -117,15 +139,22 @@ bool indexRecords::Load(const string Filename)                            /*{{{*/
       strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str());
       return false;
    }
       strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str());
       return false;
    }

-   date += 24*60*60*MaxAge;

 
 

-   if (ValidUntil == 0 || ValidUntil > date)
-      ValidUntil = date;
+   if (MinAge != 0 && ValidUntil != 0) {
+      time_t const min_date = date + MinAge;
+      if (ValidUntil < min_date)
+        ValidUntil = min_date;
+   }
+   if (MaxAge != 0) {
+      time_t const max_date = date + MaxAge;
+      if (ValidUntil == 0 || ValidUntil > max_date)
+        ValidUntil = max_date;
+   }

 
    return true;
 }
                                                                        /*}}}*/
 
    return true;
 }
                                                                        /*}}}*/

-vector<string> indexRecords::MetaKeys()                                        /*{{{*/
+std::vector<string> indexRecords::MetaKeys()                           /*{{{*/

 {
    std::vector<std::string> keys;
    std::map<string,checkSum *>::iterator I = Entries.begin();
 {
    std::vector<std::string> keys;
    std::map<string,checkSum *>::iterator I = Entries.begin();


@@ -137,13 +166,13 @@ vector<string> indexRecords::MetaKeys()                                   /*{{{*/
 }
                                                                        /*}}}*/
 bool indexRecords::parseSumData(const char *&Start, const char *End,   /*{{{*/
 }
                                                                        /*}}}*/
 bool indexRecords::parseSumData(const char *&Start, const char *End,   /*{{{*/

-                                  string &Name, string &Hash, size_t &Size)
+                                  string &Name, string &Hash, unsigned long long &Size)

 {
    Name = "";
    Hash = "";
    Size = 0;
    /* Skip over the first blank */
 {
    Name = "";
    Hash = "";
    Size = 0;
    /* Skip over the first blank */

-   while ((*Start == '\t' || *Start == ' ' || *Start == '\n')
+   while ((*Start == '\t' || *Start == ' ' || *Start == '\n' || *Start == '\r')

          && Start < End)
       Start++;
    if (Start >= End)
          && Start < End)
       Start++;
    if (Start >= End)


@@ -174,7 +203,7 @@ bool indexRecords::parseSumData(const char *&Start, const char *End,        /*{{{*/
    if (EntryEnd == End)
       return false;
    
    if (EntryEnd == End)
       return false;
    

-   Size = strtol (Start, NULL, 10);
+   Size = strtoull (Start, NULL, 10);

       
    /* Skip over intermediate blanks */
    Start = EntryEnd;
       
    /* Skip over intermediate blanks */
    Start = EntryEnd;


@@ -185,7 +214,8 @@ bool indexRecords::parseSumData(const char *&Start, const char *End,        /*{{{*/
    
    EntryEnd = Start;
    /* Find the end of the third entry (the filename) */
    
    EntryEnd = Start;
    /* Find the end of the third entry (the filename) */

-   while ((*EntryEnd != '\t' && *EntryEnd != ' ' && *EntryEnd != '\n')
+   while ((*EntryEnd != '\t' && *EntryEnd != ' ' && 
+           *EntryEnd != '\n' && *EntryEnd != '\r')

          && EntryEnd < End)
       EntryEnd++;
 
          && EntryEnd < End)
       EntryEnd++;