replace ULONG_MAX with c++ style std::numeric_limits

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

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index c509c29c7ec094c10d011b8ca2068e44125a8bb0..8fef05ab0a8eaa5b0cb3272a54b2ddfbabbc5cdd 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -1,4 +1,3 @@
-// ijones, walters

 #include <config.h>
 
 #include <apt-pkg/debmetaindex.h>
 #include <config.h>
 
 #include <apt-pkg/debmetaindex.h>


@@ -10,31 +9,20 @@
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/sourcelist.h>

-#include <apt-pkg/error.h>
-
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/metaindex.h>
+
+#include <string.h>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>

 #include <set>
 #include <set>

+#include <algorithm>

 
 using namespace std;
 
 
 using namespace std;
 

-string debReleaseIndex::Info(const char *Type, string const &Section, string const &Arch) const
-{
-   string Info = ::URI::SiteOnly(URI) + ' ';
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-         Info += Dist;
-   }
-   else
-   {
-      Info += Dist + '/' + Section;
-      if (Arch.empty() != true)
-        Info += " " + Arch;
-   }
-   Info += " ";
-   Info += Type;
-   return Info;
-}
-

 string debReleaseIndex::MetaIndexInfo(const char *Type) const
 {
    string Info = ::URI::SiteOnly(URI) + ' ';
 string debReleaseIndex::MetaIndexInfo(const char *Type) const
 {
    string Info = ::URI::SiteOnly(URI) + ' ';


@@ -71,79 +59,18 @@ string debReleaseIndex::MetaIndexURI(const char *Type) const
    return Res;
 }
 
    return Res;
 }
 

-string debReleaseIndex::IndexURISuffix(const char *Type, string const &Section, string const &Arch) const
+std::string debReleaseIndex::LocalFileName() const

 {
 {

-   string Res ="";
-   if (Dist[Dist.size() - 1] != '/')
-   {
-      if (Arch == "native")
-        Res += Section + "/binary-" + _config->Find("APT::Architecture") + '/';
-      else
-        Res += Section + "/binary-" + Arch + '/';
-   }
-   return Res + Type;
-}
-   
+   // see if we have a InRelease file
+   std::string PathInRelease =  MetaIndexFile("InRelease");
+   if (FileExists(PathInRelease))
+      return PathInRelease;

 
 

-string debReleaseIndex::IndexURI(const char *Type, string const &Section, string const &Arch) const
-{
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      string Res;
-      if (Dist != "/")
-         Res = URI + Dist;
-      else 
-         Res = URI;
-      return Res + Type;
-   }
-   else
-      return URI + "dists/" + Dist + '/' + IndexURISuffix(Type, Section, Arch);
- }
+   // and if not return the normal one
+   if (FileExists(PathInRelease))
+      return MetaIndexFile("Release");

 
 

-string debReleaseIndex::SourceIndexURISuffix(const char *Type, const string &Section) const
-{
-   string Res ="";
-   if (Dist[Dist.size() - 1] != '/')
-      Res += Section + "/source/";
-   return Res + Type;
-}
-
-string debReleaseIndex::SourceIndexURI(const char *Type, const string &Section) const
-{
-   string Res;
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-         Res = URI + Dist;
-      else 
-         Res = URI;
-      return Res + Type;
-   }
-   else
-      return URI + "dists/" + Dist + "/" + SourceIndexURISuffix(Type, Section);
-}
-
-string debReleaseIndex::TranslationIndexURISuffix(const char *Type, const string &Section) const
-{
-   string Res ="";
-   if (Dist[Dist.size() - 1] != '/')
-      Res += Section + "/i18n/";
-   return Res + Type;
-}
-
-string debReleaseIndex::TranslationIndexURI(const char *Type, const string &Section) const
-{
-   string Res;
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-         Res = URI + Dist;
-      else 
-         Res = URI;
-      return Res + Type;
-   }
-   else
-      return URI + "dists/" + Dist + "/" + TranslationIndexURISuffix(Type, Section);
+   return "";

 }
 
 debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist) :
 }
 
 debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist) :


@@ -163,99 +90,185 @@ debReleaseIndex::~debReleaseIndex() {
                        delete *S;
 }
 
                        delete *S;
 }
 

-vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
-       vector <struct IndexTarget *>* IndexTargets = new vector <IndexTarget *>;
+vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const
+{
+   vector <IndexTarget *>* IndexTargets = new vector <IndexTarget *>;

 
 

-       map<string, vector<debSectionEntry const*> >::const_iterator const src = ArchEntries.find("source");
-       if (src != ArchEntries.end()) {
-               vector<debSectionEntry const*> const SectionEntries = src->second;
-               for (vector<debSectionEntry const*>::const_iterator I = SectionEntries.begin();
-                    I != SectionEntries.end(); ++I) {
-                       IndexTarget * Target = new IndexTarget();
-                       Target->ShortDesc = "Sources";
-                       Target->MetaKey = SourceIndexURISuffix(Target->ShortDesc.c_str(), (*I)->Section);
-                       Target->URI = SourceIndexURI(Target->ShortDesc.c_str(), (*I)->Section);
-                       Target->Description = Info (Target->ShortDesc.c_str(), (*I)->Section);
-                       IndexTargets->push_back (Target);
-               }
-       }
+   bool const flatArchive = (Dist[Dist.length() - 1] == '/');
+   std::string baseURI = URI;
+   if (flatArchive)
+   {
+      if (Dist != "/")
+         baseURI += Dist;
+   }
+   else
+      baseURI += "dists/" + Dist + "/";
+   std::string const Release = (Dist == "/") ? "" : Dist;
+   std::string const Site = ::URI::SiteOnly(URI);
+   std::vector<std::string> lang = APT::Configuration::getLanguages(true);
+   if (lang.empty())
+      lang.push_back("none");
+   map<string, vector<debSectionEntry const*> >::const_iterator const src = ArchEntries.find("source");
+   if (src != ArchEntries.end())
+   {
+      std::vector<std::string> const targets = _config->FindVector("APT::Acquire::Targets::deb-src", "", true);
+      for (std::vector<std::string>::const_iterator T = targets.begin(); T != targets.end(); ++T)
+      {
+#define APT_T_CONFIG(X) _config->Find(std::string("APT::Acquire::Targets::deb-src::") + *T + "::" + (X))
+        std::string const URI = APT_T_CONFIG(flatArchive ? "flatURI" : "URI");
+        std::string const ShortDesc = APT_T_CONFIG("ShortDescription");
+        std::string const LongDesc = APT_T_CONFIG(flatArchive ? "flatDescription" : "Description");
+        bool const IsOptional = _config->FindB(std::string("APT::Acquire::Targets::deb-src::") + *T + "::Optional", true);
+#undef APT_T_CONFIG
+        if (URI.empty())
+           continue;

 
 

-       // Only source release
-       if (IndexTargets->empty() == false && ArchEntries.size() == 1)
-               return IndexTargets;
+        vector<debSectionEntry const*> const SectionEntries = src->second;
+        for (vector<debSectionEntry const*>::const_iterator I = SectionEntries.begin();
+              I != SectionEntries.end(); ++I)
+        {
+           for (vector<std::string>::const_iterator l = lang.begin(); l != lang.end(); ++l)
+           {
+              if (*l == "none" && URI.find("$(LANGUAGE)") != std::string::npos)
+                 continue;
+
+              struct SubstVar subst[] = {
+                 { "$(SITE)", &Site },
+                 { "$(RELEASE)", &Release },
+                 { "$(COMPONENT)", &((*I)->Section) },
+                 { "$(LANGUAGE)", &(*l) },
+                 { NULL, NULL }
+              };
+              std::string const name = SubstVar(URI, subst);
+              IndexTarget * Target;
+              if (IsOptional == true)
+              {
+                 Target = new OptionalIndexTarget(
+                       name,
+                       SubstVar(ShortDesc, subst),
+                       SubstVar(LongDesc, subst),
+                       baseURI + name
+                       );
+              }
+              else
+              {
+                 Target = new IndexTarget(
+                       name,
+                       SubstVar(ShortDesc, subst),
+                       SubstVar(LongDesc, subst),
+                       baseURI + name
+                       );
+              }
+              IndexTargets->push_back(Target);
+
+              if (URI.find("$(LANGUAGE)") == std::string::npos)
+                 break;
+           }

 
 

-       std::set<std::string> sections;
-       for (map<string, vector<debSectionEntry const*> >::const_iterator a = ArchEntries.begin();
-            a != ArchEntries.end(); ++a) {
-               if (a->first == "source")
-                       continue;
-               for (vector <const debSectionEntry *>::const_iterator I = a->second.begin();
-                    I != a->second.end(); ++I) {
-                       IndexTarget * Target = new IndexTarget();
-                       Target->ShortDesc = "Packages";
-                       Target->MetaKey = IndexURISuffix(Target->ShortDesc.c_str(), (*I)->Section, a->first);
-                       Target->URI = IndexURI(Target->ShortDesc.c_str(), (*I)->Section, a->first);
-                       Target->Description = Info (Target->ShortDesc.c_str(), (*I)->Section, a->first);
-                       IndexTargets->push_back (Target);
-                       sections.insert((*I)->Section);
-               }
-       }
+           if (URI.find("$(COMPONENT)") == std::string::npos)
+              break;
+        }
+      }
+   }

 
 

-       std::vector<std::string> const lang = APT::Configuration::getLanguages(true);
-       if (lang.empty() == true)
-               return IndexTargets;
-
-       // get the Translations:
-       // - if its a dists-style repository get the i18n/Index first
-       // - if its flat try to acquire files by guessing
-       if (Dist[Dist.size() - 1] == '/') {
-               for (std::set<std::string>::const_iterator s = sections.begin();
-                    s != sections.end(); ++s) {
-                       for (std::vector<std::string>::const_iterator l = lang.begin();
-                            l != lang.end(); ++l) {
-                               if (*l == "none") continue;
-                               IndexTarget * Target = new OptionalIndexTarget();
-                               Target->ShortDesc = "Translation-" + *l;
-                               Target->MetaKey = TranslationIndexURISuffix(l->c_str(), *s);
-                               Target->URI = TranslationIndexURI(l->c_str(), *s);
-                               Target->Description = Info (Target->ShortDesc.c_str(), *s);
-                               IndexTargets->push_back(Target);
-                       }
-               }
-       } else {
-               for (std::set<std::string>::const_iterator s = sections.begin();
-                    s != sections.end(); ++s) {
-                       IndexTarget * Target = new OptionalSubIndexTarget();
-                       Target->ShortDesc = "TranslationIndex";
-                       Target->MetaKey = TranslationIndexURISuffix("Index", *s);
-                       Target->URI = TranslationIndexURI("Index", *s);
-                       Target->Description = Info (Target->ShortDesc.c_str(), *s);
-                       IndexTargets->push_back (Target);
-               }
-       }
+   // Only source release
+   if (IndexTargets->empty() == false && ArchEntries.size() == 1)
+      return IndexTargets;

 
 

-       return IndexTargets;
+   std::vector<std::string> const targets = _config->FindVector("APT::Acquire::Targets::deb", "", true);
+   for (std::vector<std::string>::const_iterator T = targets.begin(); T != targets.end(); ++T)
+   {
+#define APT_T_CONFIG(X) _config->Find(std::string("APT::Acquire::Targets::deb::") + *T + "::" + (X))
+      std::string const URI = APT_T_CONFIG(flatArchive ? "flatURI" : "URI");
+      std::string const ShortDesc = APT_T_CONFIG("ShortDescription");
+      std::string const LongDesc = APT_T_CONFIG(flatArchive ? "flatDescription" : "Description");
+      bool const IsOptional = _config->FindB(std::string("APT::Acquire::Targets::deb::") + *T + "::Optional", true);
+#undef APT_T_CONFIG
+      if (URI.empty())
+        continue;
+
+      for (map<string, vector<debSectionEntry const*> >::const_iterator a = ArchEntries.begin();
+           a != ArchEntries.end(); ++a)
+      {
+        if (a->first == "source")
+           continue;
+
+        for (vector <const debSectionEntry *>::const_iterator I = a->second.begin();
+              I != a->second.end(); ++I) {
+
+           for (vector<std::string>::const_iterator l = lang.begin(); l != lang.end(); ++l)
+           {
+              if (*l == "none" && URI.find("$(LANGUAGE)") != std::string::npos)
+                 continue;
+
+              struct SubstVar subst[] = {
+                 { "$(SITE)", &Site },
+                 { "$(RELEASE)", &Release },
+                 { "$(COMPONENT)", &((*I)->Section) },
+                 { "$(LANGUAGE)", &(*l) },
+                 { "$(ARCHITECTURE)", &(a->first) },
+                 { NULL, NULL }
+              };
+              std::string const name = SubstVar(URI, subst);
+              IndexTarget * Target;
+              if (IsOptional == true)
+              {
+                 Target = new OptionalIndexTarget(
+                       name,
+                       SubstVar(ShortDesc, subst),
+                       SubstVar(LongDesc, subst),
+                       baseURI + name
+                       );
+              }
+              else
+              {
+                 Target = new IndexTarget(
+                       name,
+                       SubstVar(ShortDesc, subst),
+                       SubstVar(LongDesc, subst),
+                       baseURI + name
+                       );
+              }
+              IndexTargets->push_back(Target);
+
+              if (URI.find("$(LANGUAGE)") == std::string::npos)
+                 break;
+           }
+
+           if (URI.find("$(COMPONENT)") == std::string::npos)
+              break;
+        }
+
+        if (URI.find("$(ARCHITECTURE)") == std::string::npos)
+           break;
+      }
+   }
+
+   return IndexTargets;

 }
                                                                        /*}}}*/
 bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
 {
 }
                                                                        /*}}}*/
 bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
 {

+   indexRecords * const iR = new indexRecords(Dist);
+   if (Trusted == ALWAYS_TRUSTED)
+      iR->SetTrusted(true);
+   else if (Trusted == NEVER_TRUSTED)
+      iR->SetTrusted(false);
+

    // special case for --print-uris
    // special case for --print-uris

-   if (GetAll) {
-      vector <struct IndexTarget *> *targets = ComputeIndexTargets();
-      for (vector <struct IndexTarget*>::const_iterator Target = targets->begin(); Target != targets->end(); ++Target) {
-        new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description,
-                        (*Target)->ShortDesc, HashString());
-      }
+   vector <IndexTarget *> const * const targets = ComputeIndexTargets();
+#define APT_TARGET(X) IndexTarget("", X, MetaIndexInfo(X), MetaIndexURI(X))
+   pkgAcqMetaBase * const TransactionManager = new pkgAcqMetaClearSig(Owner,
+        APT_TARGET("InRelease"), APT_TARGET("Release"), APT_TARGET("Release.gpg"),
+        targets, iR);
+#undef APT_TARGET
+   if (GetAll)
+   {
+      for (vector <IndexTarget*>::const_iterator Target = targets->begin(); Target != targets->end(); ++Target)
+        new pkgAcqIndex(Owner, TransactionManager, *Target);

    }
 
    }
 

-       new pkgAcqMetaClearSig(Owner, MetaIndexURI("InRelease"),
-               MetaIndexInfo("InRelease"), "InRelease",
-               MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release",
-               MetaIndexURI("Release.gpg"), MetaIndexInfo("Release.gpg"), "Release.gpg",
-               ComputeIndexTargets(),
-               new indexRecords (Dist));
-
-       return true;
+   return true;

 }
 
 void debReleaseIndex::SetTrusted(bool const Trusted)
 }
 
 void debReleaseIndex::SetTrusted(bool const Trusted)


@@ -342,22 +355,11 @@ void debReleaseIndex::PushSectionEntry(string const &Arch, const debSectionEntry
        ArchEntries[Arch].push_back(Entry);
 }
 
        ArchEntries[Arch].push_back(Entry);
 }
 

-void debReleaseIndex::PushSectionEntry(const debSectionEntry *Entry) {
-       if (Entry->IsSrc == true)
-               PushSectionEntry("source", Entry);
-       else {
-               for (map<string, vector<const debSectionEntry *> >::iterator a = ArchEntries.begin();
-                    a != ArchEntries.end(); ++a) {
-                       a->second.push_back(Entry);
-               }
-       }
-}
-

 debReleaseIndex::debSectionEntry::debSectionEntry (string const &Section,
                bool const &IsSrc): Section(Section), IsSrc(IsSrc)
 {}
 
 debReleaseIndex::debSectionEntry::debSectionEntry (string const &Section,
                bool const &IsSrc): Section(Section), IsSrc(IsSrc)
 {}
 

-class debSLTypeDebian : public pkgSourceList::Type
+class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type

 {
    protected:
 
 {
    protected:
 


@@ -365,10 +367,32 @@ class debSLTypeDebian : public pkgSourceList::Type
                           string const &Dist, string const &Section,
                           bool const &IsSrc, map<string, string> const &Options) const
    {
                           string const &Dist, string const &Section,
                           bool const &IsSrc, map<string, string> const &Options) const
    {

-      map<string, string>::const_iterator const arch = Options.find("arch");
-      vector<string> const Archs =
-               (arch != Options.end()) ? VectorizeString(arch->second, ',') :
-                               APT::Configuration::getArchitectures();
+      // parse arch=, arch+= and arch-= settings
+      map<string, string>::const_iterator arch = Options.find("arch");
+      vector<string> Archs;
+      if (arch != Options.end())
+        Archs = VectorizeString(arch->second, ',');
+      else
+        Archs = APT::Configuration::getArchitectures();
+
+      if ((arch = Options.find("arch+")) != Options.end())
+      {
+        std::vector<std::string> const plusArch = VectorizeString(arch->second, ',');
+        for (std::vector<std::string>::const_iterator plus = plusArch.begin(); plus != plusArch.end(); ++plus)
+           if (std::find(Archs.begin(), Archs.end(), *plus) == Archs.end())
+              Archs.push_back(*plus);
+      }
+      if ((arch = Options.find("arch-")) != Options.end())
+      {
+        std::vector<std::string> const minusArch = VectorizeString(arch->second, ',');
+        for (std::vector<std::string>::const_iterator minus = minusArch.begin(); minus != minusArch.end(); ++minus)
+        {
+           std::vector<std::string>::iterator kill = std::find(Archs.begin(), Archs.end(), *minus);
+           if (kill != Archs.end())
+              Archs.erase(kill);
+        }
+      }
+

       map<string, string>::const_iterator const trusted = Options.find("trusted");
 
       for (vector<metaIndex *>::const_iterator I = List.begin();
       map<string, string>::const_iterator const trusted = Options.find("trusted");
 
       for (vector<metaIndex *>::const_iterator I = List.begin();


@@ -421,7 +445,16 @@ class debSLTypeDebian : public pkgSourceList::Type
    }
 };
 
    }
 };
 

-class debSLTypeDeb : public debSLTypeDebian
+debDebFileMetaIndex::debDebFileMetaIndex(std::string const &DebFile)
+   : metaIndex(DebFile, "local-uri", "deb-dist"), DebFile(DebFile)
+{
+   DebIndex = new debDebPkgFileIndex(DebFile);
+   Indexes = new vector<pkgIndexFile *>();
+   Indexes->push_back(DebIndex);
+}
+
+
+class APT_HIDDEN debSLTypeDeb : public debSLTypeDebian

 {
    public:
 
 {
    public:
 


@@ -439,7 +472,7 @@ class debSLTypeDeb : public debSLTypeDebian
    }   
 };
 
    }   
 };
 

-class debSLTypeDebSrc : public debSLTypeDebian
+class APT_HIDDEN debSLTypeDebSrc : public debSLTypeDebian

 {
    public:
 
 {
    public:
 


@@ -457,5 +490,26 @@ class debSLTypeDebSrc : public debSLTypeDebian
    }   
 };
 
    }   
 };
 

-debSLTypeDeb _apt_DebType;
-debSLTypeDebSrc _apt_DebSrcType;
+class APT_HIDDEN debSLTypeDebFile : public pkgSourceList::Type
+{
+   public:
+
+   bool CreateItem(vector<metaIndex *> &List, string const &URI,
+                  string const &/*Dist*/, string const &/*Section*/,
+                  std::map<string, string> const &/*Options*/) const
+   {
+      metaIndex *mi = new debDebFileMetaIndex(URI);
+      List.push_back(mi);
+      return true;
+   }
+   
+   debSLTypeDebFile()
+   {
+      Name = "deb-file";
+      Label = "Debian Deb File";
+   }   
+};
+
+APT_HIDDEN debSLTypeDeb _apt_DebType;
+APT_HIDDEN debSLTypeDebSrc _apt_DebSrcType;
+APT_HIDDEN debSLTypeDebFile _apt_DebFileType;