Store tags in the cache (they are very useful :/).

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

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index bce3e5990dcf46b8fd2a9c057cb8b2fdf5c2d6cb..df2e0b46d725c968310916e5d4f244e391000568 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: sourcelist.cc,v 1.2 1998/07/09 05:12:28 jgg Exp $
+// $Id: sourcelist.cc,v 1.3 2002/08/15 20:51:37 niemeyer Exp $

 /* ######################################################################
 
    List of Sources
 /* ######################################################################
 
    List of Sources


@@ -8,283 +8,643 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "pkglib/sourcelist.h"
-#endif
+#include<config.h>
+
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/metaindex.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/debindexfile.h>
+#include <apt-pkg/debsrcrecords.h>

 
 

-#include <pkglib/sourcelist.h>
-#include <pkglib/error.h>
-#include <pkglib/fileutl.h>
-#include <pkglib/configuration.h>
-#include <strutl.h>
+#include <ctype.h>
+#include <stddef.h>
+#include <time.h>
+#include <cstring>
+#include <map>
+#include <string>
+#include <vector>
+#include <fstream>
+#include <algorithm>

 
 

-#include <fstream.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include <apti18n.h>

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

-// SourceList::pkgSourceList - Constructors                            /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgSourceList::pkgSourceList()
-{
-}
+using namespace std;
+
+// Global list of Items supported
+static pkgSourceList::Type *ItmList[10];
+pkgSourceList::Type **pkgSourceList::Type::GlobalList = ItmList;
+unsigned long pkgSourceList::Type::GlobalListLen = 0;

 
 

-pkgSourceList::pkgSourceList(string File)
+// Type::Type - Constructor                                            /*{{{*/
+// ---------------------------------------------------------------------
+/* Link this to the global list of items*/
+pkgSourceList::Type::Type(char const * const pName, char const * const pLabel) : Name(pName), Label(pLabel)

 {
 {

-   Read(File);
+   ItmList[GlobalListLen] = this;
+   ++GlobalListLen;

 }
 }

+pkgSourceList::Type::~Type() {}

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

-// SourceList::ReadMainList - Read the main source list from etc       /*{{{*/
+// Type::GetType - Get a specific meta for a given type                        /*{{{*/

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

-bool pkgSourceList::ReadMainList()
+pkgSourceList::Type *pkgSourceList::Type::GetType(const char *Type)

 {
 {

-   return Read(_config->Find("APT::Etc:sourcelist"));
+   for (unsigned I = 0; I != GlobalListLen; ++I)
+      if (strcmp(GlobalList[I]->Name,Type) == 0)
+        return GlobalList[I];
+   return 0;

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

-// SourceList::Read - Parse the sourcelist file                                /*{{{*/
+// Type::FixupURI - Normalize the URI and check it..                   /*{{{*/

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

-bool pkgSourceList::Read(string File)
+bool pkgSourceList::Type::FixupURI(string &URI) const

 {
 {

-   // Open the stream for reading
-   ifstream F(File.c_str(),ios::in | ios::nocreate);
-   if (!F != 0)
-      return _error->Errno("ifstream::ifstream","Opening %s",File.c_str());
+   if (URI.empty() == true)
+      return false;
+
+   if (URI.find(':') == string::npos)
+      return false;
+
+   URI = SubstVar(URI,"$(ARCH)",_config->Find("APT::Architecture"));
+   
+   // Make sure that the URI is / postfixed
+   if (URI[URI.size() - 1] != '/')
+      URI += '/';

    
    

-   List.erase(List.begin(),List.end());
-   char Buffer[300];
+   return true;
+}
+                                                                       /*}}}*/
+bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,       /*{{{*/
+                                      pkgTagSection &Tags,
+                                      unsigned int const i,
+                                      FileFd &Fd)
+{
+   map<string, string> Options;
+
+   string Enabled = Tags.FindS("Enabled");
+   if (Enabled.empty() == false && StringToBool(Enabled) == false)
+      return true;
+
+   std::map<char const * const, std::pair<char const * const, bool> > mapping;
+#define APT_PLUSMINUS(X, Y) \
+   mapping.insert(std::make_pair(X, std::make_pair(Y, true))); \
+   mapping.insert(std::make_pair(X "-Add", std::make_pair(Y "+", true))); \
+   mapping.insert(std::make_pair(X "-Remove", std::make_pair(Y "-", true)))
+   APT_PLUSMINUS("Architectures", "arch");
+   APT_PLUSMINUS("Languages", "lang");
+   APT_PLUSMINUS("Targets", "target");
+#undef APT_PLUSMINUS
+   mapping.insert(std::make_pair("Trusted", std::make_pair("trusted", false)));
+   mapping.insert(std::make_pair("Check-Valid-Until", std::make_pair("check-valid-until", false)));
+   mapping.insert(std::make_pair("Valid-Until-Min", std::make_pair("valid-until-min", false)));
+   mapping.insert(std::make_pair("Valid-Until-Max", std::make_pair("valid-until-max", false)));
+   mapping.insert(std::make_pair("Signed-By", std::make_pair("signed-by", false)));
+   mapping.insert(std::make_pair("PDiffs", std::make_pair("pdiffs", false)));
+   mapping.insert(std::make_pair("By-Hash", std::make_pair("by-hash", false)));
+
+   for (std::map<char const * const, std::pair<char const * const, bool> >::const_iterator m = mapping.begin(); m != mapping.end(); ++m)
+      if (Tags.Exists(m->first))
+      {
+        std::string option = Tags.FindS(m->first);
+        // for deb822 the " " is the delimiter, but the backend expects ","
+        if (m->second.second == true)
+           std::replace(option.begin(), option.end(), ' ', ',');
+        Options[m->second.first] = option;
+      }

 
 

-   int CurLine = 0;
-   while (F.eof() == false)

    {
    {

-      F.getline(Buffer,sizeof(Buffer));
-      CurLine++;
-      _strtabexpand(Buffer,sizeof(Buffer));
-      _strstrip(Buffer);
-      
-      // Comment or blank
-      if (Buffer[0] == '#' || Buffer[0] == 0)
-        continue;
-      
-      // Grok it
-      string Type;
-      string URI;
-      Item Itm;
-      char *C = Buffer;
-      if (ParseQuoteWord(C,Type) == false)
-        return _error->Error("Malformed line %u in source list %s (type)",CurLine,File.c_str());
-      if (ParseQuoteWord(C,URI) == false)
-        return _error->Error("Malformed line %u in source list %s (URI)",CurLine,File.c_str());
-      if (ParseQuoteWord(C,Itm.Dist) == false)
-        return _error->Error("Malformed line %u in source list %s (dist)",CurLine,File.c_str());
-      if (Itm.SetType(Type) == false)
-        return _error->Error("Malformed line %u in source list %s (type parse)",CurLine,File.c_str());
-      if (Itm.SetURI(URI) == false)
-        return _error->Error("Malformed line %u in source list %s (URI parse)",CurLine,File.c_str());
-
-      // Check for an absolute dists specification.
-      if (Itm.Dist.empty() == false && Itm.Dist[Itm.Dist.size() - 1] == '/')
+      std::string entry;
+      strprintf(entry, "%s:%i", Fd.Name().c_str(), i);
+      Options["sourceslist-entry"] = entry;
+   }
+
+   // now create one item per suite/section
+   string Suite = Tags.FindS("Suites");
+   Suite = SubstVar(Suite,"$(ARCH)",_config->Find("APT::Architecture"));
+   string const Component = Tags.FindS("Components");
+   string const URIS = Tags.FindS("URIs");
+
+   std::vector<std::string> const list_uris = VectorizeString(URIS, ' ');
+   std::vector<std::string> const list_suite = VectorizeString(Suite, ' ');
+   std::vector<std::string> const list_comp = VectorizeString(Component, ' ');
+
+   if (list_uris.empty())
+      // TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+      return _error->Error(_("Malformed entry %u in %s file %s (%s)"), i, "sources", Fd.Name().c_str(), "URI");
+
+   for (std::vector<std::string>::const_iterator U = list_uris.begin();
+        U != list_uris.end(); ++U)
+   {
+      std::string URI = *U;
+      if (U->empty() || FixupURI(URI) == false)
+        return _error->Error(_("Malformed entry %u in %s file %s (%s)"), i, "sources", Fd.Name().c_str(), "URI parse");
+
+      if (list_suite.empty())
+        return _error->Error(_("Malformed entry %u in %s file %s (%s)"), i, "sources", Fd.Name().c_str(), "Suite");
+
+      for (std::vector<std::string>::const_iterator S = list_suite.begin();
+           S != list_suite.end(); ++S)

       {
       {

-        if (ParseQuoteWord(C,Itm.Section) == true)
-           return _error->Error("Malformed line %u in source list %s (Absolute dist)",CurLine,File.c_str());
-        Itm.Dist = SubstVar(Itm.Dist,"$(ARCH)",_config->Find("APT::Architecture"));
-        List.push_back(Itm);
-        continue;
+        if (S->empty() == false && (*S)[S->size() - 1] == '/')
+        {
+           if (list_comp.empty() == false)
+              return _error->Error(_("Malformed entry %u in %s file %s (%s)"), i, "sources", Fd.Name().c_str(), "absolute Suite Component");
+           if (CreateItem(List, URI, *S, "", Options) == false)
+              return false;
+        }
+        else
+        {
+           if (list_comp.empty())
+              return _error->Error(_("Malformed entry %u in %s file %s (%s)"), i, "sources", Fd.Name().c_str(), "Component");
+
+           for (std::vector<std::string>::const_iterator C = list_comp.begin();
+                 C != list_comp.end(); ++C)
+           {
+              if (CreateItem(List, URI, *S, *C, Options) == false)
+              {
+                 return false;
+              }
+           }
+        }

       }
       }

+   }
+   return true;
+}
+                                                                       /*}}}*/
+// Type::ParseLine - Parse a single line                               /*{{{*/
+// ---------------------------------------------------------------------
+/* This is a generic one that is the 'usual' format for sources.list
+   Weird types may override this. */
+bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List,
+                                   const char *Buffer,
+                                   unsigned int const CurLine,
+                                   string const &File) const
+{
+   for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces

 
 

-      // Grab the rest of the dists
-      if (ParseQuoteWord(C,Itm.Section) == false)
-           return _error->Error("Malformed line %u in source list %s (dist parse)",CurLine,File.c_str());
-      
-      do
+   // Parse option field if it exists
+   // e.g.: [ option1=value1 option2=value2 ]
+   map<string, string> Options;
+   {
+      std::string entry;
+      strprintf(entry, "%s:%i", File.c_str(), CurLine);
+      Options["sourceslist-entry"] = entry;
+   }
+   if (Buffer != 0 && Buffer[0] == '[')
+   {
+      ++Buffer; // ignore the [
+      for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces
+      while (*Buffer != ']')

       {
       {

-        List.push_back(Itm);
+        // get one option, e.g. option1=value1
+        string option;
+        if (ParseQuoteWord(Buffer,option) == false)
+           return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "[option] unparseable");
+
+        if (option.length() < 3)
+           return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "[option] too short");
+
+        // accept options even if the last has no space before the ]-end marker
+        if (option.at(option.length()-1) == ']')
+        {
+           for (; *Buffer != ']'; --Buffer);
+           option.resize(option.length()-1);
+        }
+
+        size_t const needle = option.find('=');
+        if (needle == string::npos)
+           return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "[option] not assignment");
+
+        string const key = string(option, 0, needle);
+        string const value = string(option, needle + 1, option.length());
+
+        if (key.empty() == true)
+           return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "[option] no key");
+
+        if (value.empty() == true)
+           return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "[option] no value");
+
+        Options[key] = value;

       }
       }

-      while (ParseQuoteWord(C,Itm.Section) == true);
+      ++Buffer; // ignore the ]
+      for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces
+   }
+
+   string URI;
+   string Dist;
+   string Section;
+
+   if (ParseQuoteWord(Buffer,URI) == false)
+      return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "URI");
+   if (ParseQuoteWord(Buffer,Dist) == false)
+      return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "Suite");
+
+   if (FixupURI(URI) == false)
+      return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "URI parse");
+
+   // Check for an absolute dists specification.
+   if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
+   {
+      if (ParseQuoteWord(Buffer,Section) == true)
+        return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "absolute Suite Component");
+      Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));
+      return CreateItem(List, URI, Dist, Section, Options);
+   }
+
+   // Grab the rest of the dists
+   if (ParseQuoteWord(Buffer,Section) == false)
+      return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "Component");
+
+   do
+   {
+      if (CreateItem(List, URI, Dist, Section, Options) == false)
+        return false;

    }
    }

+   while (ParseQuoteWord(Buffer,Section) == true);
+

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

-// SourceList::SanitizeURI - Hash the uri                              /*{{{*/
+// SourceList::pkgSourceList - Constructors                            /*{{{*/

 // ---------------------------------------------------------------------
 // ---------------------------------------------------------------------

-/* This converts a URI into a safe filename. It quotes all unsafe characters
-   and converts / to _ and removes the scheme identifier. */
-string pkgSourceList::SanitizeURI(string URI)
+/* */
+pkgSourceList::pkgSourceList() : d(NULL)

 {
 {

-   string::const_iterator I = URI.begin() + URI.find(':') + 1;
-   for (; I < URI.end() && *I == '/'; I++);
-
-   // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF";
-   URI = QuoteString(string(I,URI.end() - I),"\\|{}[]<>\"^~_=!@#$%^&*");
-   string::iterator J = URI.begin();
-   for (; J != URI.end(); J++)
-      if (*J == '/') 
-        *J = '_';
-   return URI;

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

-// SourceList::MatchPkgFile - Find the package file that has the ver   /*{{{*/
+// SourceList::~pkgSourceList - Destructor                             /*{{{*/

 // ---------------------------------------------------------------------
 // ---------------------------------------------------------------------

-/* This will return List.end() if it could not find the matching 
-   file */
-pkgSourceList::const_iterator pkgSourceList::MatchPkgFile(pkgCache::VerIterator Ver)
+/* */
+pkgSourceList::~pkgSourceList()

 {
 {

-   string Base = _config->Find("APT::Architecture");
-   for (const_iterator I = List.begin(); I != List.end(); I++)
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); ++I)
+      delete *I;
+   SrcList.clear();
+   for (auto  F = VolatileFiles.begin(); F != VolatileFiles.end(); ++F)
+      delete (*F);
+   VolatileFiles.clear();
+}
+                                                                       /*}}}*/
+// SourceList::ReadMainList - Read the main source list from etc       /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::ReadMainList()
+{
+   // CNC:2003-03-03 - Multiple sources list support.
+   bool Res = true;
+#if 0
+   Res = ReadVendors();
+   if (Res == false)
+      return false;
+#endif
+
+   Reset();
+   // CNC:2003-11-28 - Entries in sources.list have priority over
+   //                  entries in sources.list.d.
+   string Main = _config->FindFile("Dir::Etc::sourcelist", "/dev/null");
+   string Parts = _config->FindDir("Dir::Etc::sourceparts", "/dev/null");
+   
+   if (RealFileExists(Main) == true)
+      Res &= ReadAppend(Main);
+   else if (DirectoryExists(Parts) == false && APT::String::Endswith(Parts, "/dev/null") == false)
+      // Only warn if there are no sources.list.d.
+      _error->WarningE("DirectoryExists", _("Unable to read %s"), Parts.c_str());
+
+   if (DirectoryExists(Parts) == true)
+      Res &= ReadSourceDir(Parts);
+   else if (Main.empty() == false && RealFileExists(Main) == false &&
+        APT::String::Endswith(Parts, "/dev/null") == false)
+      // Only warn if there is no sources.list file.
+      _error->WarningE("RealFileExists", _("Unable to read %s"), Main.c_str());
+
+   for (auto && file: _config->FindVector("APT::Sources::With"))
+      Res &= AddVolatileFile(file, nullptr);
+
+   return Res;
+}
+                                                                       /*}}}*/
+// SourceList::Reset - Clear the sourcelist contents                   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgSourceList::Reset()
+{
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); ++I)
+      delete *I;
+   SrcList.clear();
+}
+                                                                       /*}}}*/
+// SourceList::Read - Parse the sourcelist file                                /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::Read(string const &File)
+{
+   Reset();
+   return ReadAppend(File);
+}
+                                                                       /*}}}*/
+// SourceList::ReadAppend - Parse a sourcelist file                    /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::ReadAppend(string const &File)
+{
+   if (flExtension(File) == "sources")
+      return ParseFileDeb822(File);
+   else
+      return ParseFileOldStyle(File);
+}
+                                                                       /*}}}*/
+// SourceList::ReadFileOldStyle - Read Traditional style sources.list  /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::ParseFileOldStyle(std::string const &File)
+{
+   // Open the stream for reading
+   ifstream F(File.c_str(),ios::in /*| ios::nocreate*/);
+   if (F.fail() == true)
+      return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str());
+
+   std::string Buffer;
+   for (unsigned int CurLine = 1; std::getline(F, Buffer); ++CurLine)

    {
    {

-      string URI = I->PackagesURI();
-      switch (I->Type)
+      // remove comments
+      size_t curpos = 0;
+      while ((curpos = Buffer.find('#', curpos)) != std::string::npos)

       {
       {

-        case Item::Deb:
-/*      if (Base + SanitizeURI(URI) == Ver.File().FileName())
-           return I;*/
+        size_t const openbrackets = std::count(Buffer.begin(), Buffer.begin() + curpos, '[');
+        size_t const closedbrackets = std::count(Buffer.begin(), Buffer.begin() + curpos, ']');
+        if (openbrackets > closedbrackets)
+        {
+           // a # in an option, unlikely, but oh well, it was supported so stick to it
+           ++curpos;
+           continue;
+        }
+        Buffer.erase(curpos);

         break;
         break;

-      };      
+      }
+      // remove spaces before/after
+      curpos = Buffer.find_first_not_of(" \t\r");
+      if (curpos != 0)
+        Buffer.erase(0, curpos);
+      curpos = Buffer.find_last_not_of(" \t\r");
+      if (curpos != std::string::npos)
+        Buffer.erase(curpos + 1);
+
+      if (Buffer.empty())
+        continue;
+
+      // Grok it
+      std::string const LineType = Buffer.substr(0, Buffer.find_first_of(" \t\v"));
+      if (LineType.empty() || LineType == Buffer)
+        return _error->Error(_("Malformed line %u in source list %s (type)"),CurLine,File.c_str());
+
+      Type *Parse = Type::GetType(LineType.c_str());
+      if (Parse == 0)
+        return _error->Error(_("Type '%s' is not known on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str());
+
+      if (Parse->ParseLine(SrcList, Buffer.c_str() + LineType.length(), CurLine, File) == false)
+        return false;

    }
    }

-   return List.end();
+   return true;

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

-// SourceList::Item << - Writes the item to a stream                   /*{{{*/
+// SourceList::ParseFileDeb822 - Parse deb822 style sources.list       /*{{{*/

 // ---------------------------------------------------------------------
 // ---------------------------------------------------------------------

-/* This is not suitable for rebuilding the sourcelist file but it good for
-   debugging. */
-ostream &operator <<(ostream &O,pkgSourceList::Item &Itm)
+/* Returns: the number of stanzas parsed*/
+bool pkgSourceList::ParseFileDeb822(string const &File)

 {
 {

-   O << Itm.Type << ' ' << Itm.URI << ' ' << Itm.Dist << ' ' << Itm.Section;
-   return O;
+   // see if we can read the file
+   FileFd Fd(File, FileFd::ReadOnly);
+   pkgTagFile Sources(&Fd, pkgTagFile::SUPPORT_COMMENTS);
+   if (Fd.IsOpen() == false || Fd.Failed())
+      return _error->Error(_("Malformed stanza %u in source list %s (type)"),0,File.c_str());
+
+   // read step by step
+   pkgTagSection Tags;
+   unsigned int i = 0;
+   while (Sources.Step(Tags) == true)
+   {
+      ++i;
+      if(Tags.Exists("Types") == false)
+        return _error->Error(_("Malformed stanza %u in source list %s (type)"),i,File.c_str());
+
+      string const types = Tags.FindS("Types");
+      std::vector<std::string> const list_types = VectorizeString(types, ' ');
+      for (std::vector<std::string>::const_iterator I = list_types.begin();
+        I != list_types.end(); ++I)
+      {
+         Type *Parse = Type::GetType((*I).c_str());
+         if (Parse == 0)
+         {
+            _error->Error(_("Type '%s' is not known on stanza %u in source list %s"), (*I).c_str(),i,Fd.Name().c_str());
+            return false;
+         }
+
+         if (!Parse->ParseStanza(SrcList, Tags, i, Fd))
+            return false;
+      }
+   }
+   return true;

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

-// SourceList::Item::SetType - Sets the distribution type              /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool pkgSourceList::Item::SetType(string S)
+// SourceList::FindIndex - Get the index associated with a file                /*{{{*/
+static bool FindInIndexFileContainer(std::vector<pkgIndexFile *> const &Cont, pkgCache::PkgFileIterator const &File, pkgIndexFile *&Found)

 {
 {

-   if (S == "deb")
+   auto const J = std::find_if(Cont.begin(), Cont.end(), [&File](pkgIndexFile const * const J) {
+        return J->FindInCache(*File.Cache()) == File;
+   });
+   if (J != Cont.end())

    {
    {

-      Type = Deb;
+      Found = (*J);

       return true;
    }
       return true;
    }

+   return false;
+}
+bool pkgSourceList::FindIndex(pkgCache::PkgFileIterator File,
+                             pkgIndexFile *&Found) const
+{
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); ++I)
+      if (FindInIndexFileContainer(*(*I)->GetIndexFiles(), File, Found))
+        return true;

 
 

+   return FindInIndexFileContainer(VolatileFiles, File, Found);
+}
+                                                                       /*}}}*/
+// SourceList::GetIndexes - Load the index files into the downloader   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const
+{
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); ++I)
+      if ((*I)->GetIndexes(Owner,GetAll) == false)
+        return false;

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

-// SourceList::Item::SetURI - Set the URI                              /*{{{*/
+// CNC:2003-03-03 - By Anton V. Denisov <avd@altlinux.org>.
+// SourceList::ReadSourceDir - Read a directory with sources files
+// Based on ReadConfigDir()                                            /*{{{*/

 // ---------------------------------------------------------------------
 // ---------------------------------------------------------------------

-/* For simplicity we strip the scheme off the uri */
-bool pkgSourceList::Item::SetURI(string S)
+/* */
+bool pkgSourceList::ReadSourceDir(string const &Dir)

 {
 {

-   if (S.empty() == true)
-      return false;
+   std::vector<std::string> ext;
+   ext.push_back("list");
+   ext.push_back("sources");
+   std::vector<std::string> const List = GetListOfFilesInDir(Dir, ext, true);

 
 

-   if (S.find(':') == string::npos)
-      return false;
-
-   S = SubstVar(S,"$(ARCH)",_config->Find("APT::Architecture"));
-   
-   // Make sure that the URN is / postfixed
-   URI = S;
-   if (URI[URI.size() - 1] != '/')
-      URI += '/';
-   
+   // Read the files
+   for (vector<string>::const_iterator I = List.begin(); I != List.end(); ++I)
+      if (ReadAppend(*I) == false)
+        return false;

    return true;
    return true;

+

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

-// SourceList::Item::PackagesURI - Returns a URI to the packages file  /*{{{*/
+// GetLastModified()                                           /*{{{*/

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

-string pkgSourceList::Item::PackagesURI() const
+time_t pkgSourceList::GetLastModifiedTime()

 {
 {

-   string Res;
-   switch (Type)
-   {
-      case Deb:
-      if (Dist[Dist.size() - 1] == '/')
-        Res = URI + Dist;
-      else
-        Res = URI + "dists/" + Dist + '/' + Section +
-        "/binary-" + _config->Find("APT::Architecture") + '/';
-      
-      Res += "Packages";
-      break;
-   };
-   return Res;
+   vector<string> List;
+
+   string Main = _config->FindFile("Dir::Etc::sourcelist");
+   string Parts = _config->FindDir("Dir::Etc::sourceparts");
+
+   // go over the parts
+   if (DirectoryExists(Parts) == true)
+      List = GetListOfFilesInDir(Parts, "list", true);
+
+   // calculate the time
+   std::vector<time_t> modtimes;
+   modtimes.reserve(1 + List.size());
+   modtimes.push_back(GetModificationTime(Main));
+   std::transform(List.begin(), List.end(), std::back_inserter(modtimes), GetModificationTime);
+   auto const maxmtime = std::max_element(modtimes.begin(), modtimes.end());
+   return *maxmtime;

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

-// SourceList::Item::PackagesInfo - Shorter version of the URI         /*{{{*/
-// ---------------------------------------------------------------------
-/* This is a shorter version that is designed to be < 60 chars or so */
-string pkgSourceList::Item::PackagesInfo() const
+std::vector<pkgIndexFile*> pkgSourceList::GetVolatileFiles() const     /*{{{*/

 {
 {

-   string Res;
-   switch (Type)
-   {
-      case Deb:
-      Res += SiteOnly(URI) + ' ';
-      if (Dist[Dist.size() - 1] == '/')
-        Res += Dist;
-      else
-        Res += Dist + '/' + Section;
-      
-      Res += " Packages";
-      break;
-   };
-   return Res;
+   return VolatileFiles;

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

-// SourceList::Item::ArchiveInfo - Shorter version of the archive spec /*{{{*/
-// ---------------------------------------------------------------------
-/* This is a shorter version that is designed to be < 60 chars or so */
-string pkgSourceList::Item::ArchiveInfo(pkgCache::VerIterator Ver) const
+void pkgSourceList::AddVolatileFile(pkgIndexFile * const File)         /*{{{*/
+{
+   if (File != nullptr)
+      VolatileFiles.push_back(File);
+}
+                                                                       /*}}}*/
+static bool fileNameMatches(std::string const &filename, std::string const &idxtype)/*{{{*/

 {
 {

-   string Res;
-   switch (Type)
+   for (auto && type: APT::Configuration::getCompressionTypes())

    {
    {

-      case Deb:
-      Res += SiteOnly(URI) + ' ';
-      if (Dist[Dist.size() - 1] == '/')
-        Res += Dist;
-      else
-        Res += Dist + '/' + Section;
-      
-      Res += " ";
-      Res += Ver.ParentPkg().Name();
-      break;
-   };
-   return Res;
+      if (type == "uncompressed")
+      {
+        if (filename == idxtype || APT::String::Endswith(filename, '_' + idxtype))
+           return true;
+      }
+      else if (filename == idxtype + '.' + type ||
+           APT::String::Endswith(filename, '_' + idxtype + '.' + type))
+        return true;
+   }
+   return false;

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

-// SourceList::Item::ArchiveURI - Returns a URI to the given archive   /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string pkgSourceList::Item::ArchiveURI(string File) const
+bool pkgSourceList::AddVolatileFile(std::string const &File, std::vector<std::string> * const VolatileCmdL)/*{{{*/

 {
 {

-   string Res;
-   switch (Type)
+   // Note: FileExists matches directories and links, too!
+   if (File.empty() || FileExists(File) == false)
+      return false;
+
+   std::string const ext = flExtension(File);
+   // udeb is not included as installing it is usually a mistake rather than intended
+   if (ext == "deb" || ext == "ddeb")
+      AddVolatileFile(new debDebPkgFileIndex(File));
+   else if (ext == "dsc")
+      AddVolatileFile(new debDscFileIndex(File));
+   else if (FileExists(flCombine(File, "debian/control")))
+      AddVolatileFile(new debDscFileIndex(flCombine(File, "debian/control")));
+   else if (ext == "changes")

    {
    {

-      case Deb:
-      Res = URI + File;
-      break;
-   };
-   return Res;
+      debDscRecordParser changes(File, nullptr);
+      std::vector<pkgSrcRecords::File2> fileslst;
+      if (changes.Files2(fileslst) == false || fileslst.empty())
+        return false;
+      auto const basedir = flNotFile(File);
+      for (auto && file: fileslst)
+      {
+        auto const name = flCombine(basedir, file.Path);
+        AddVolatileFile(name, VolatileCmdL);
+        if (file.Hashes.VerifyFile(name) == false)
+           return _error->Error("The file %s does not match with the hashes in the %s file!", name.c_str(), File.c_str());
+      }
+      return true;
+   }
+   else
+   {
+      auto const filename = flNotDir(File);
+      auto const Target = IndexTarget(File, filename, File, "file:" + File, false, true, {
+        { "FILENAME", File },
+        { "REPO_URI", "file:" + flAbsPath(flNotFile(File)) + '/' },
+        { "COMPONENT", "volatile-packages-file" },
+      });
+      if (fileNameMatches(filename, "Packages"))
+        AddVolatileFile(new debPackagesIndex(Target, true));
+      else if (fileNameMatches(filename, "Sources"))
+        AddVolatileFile(new debSourcesIndex(Target, true));
+      else
+        return false;
+   }
+
+   if (VolatileCmdL != nullptr)
+      VolatileCmdL->push_back(File);
+   return true;
+}
+bool pkgSourceList::AddVolatileFile(std::string const &File)
+{
+   return AddVolatileFile(File, nullptr);

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

-// SourceList::Item::SiteOnly - Strip off the path part of a URI       /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string pkgSourceList::Item::SiteOnly(string URI) const
+void pkgSourceList::AddVolatileFiles(CommandLine &CmdL, std::vector<std::string> * const VolatileCmdL)/*{{{*/

 {
 {

-   unsigned int Pos = URI.find(':');
-   if (Pos == string::npos || Pos + 3 > URI.length())
-      return URI;
-   if (URI[Pos + 1] != '/' || URI[Pos + 2] != '/')
-      return URI;
-
-   Pos = URI.find('/',Pos + 3);
-   if (Pos == string::npos)
-      return URI;
-   return string(URI,0,Pos);
+   std::remove_if(CmdL.FileList + 1, CmdL.FileList + 1 + CmdL.FileSize(), [&](char const * const I) {
+      if (I != nullptr && (I[0] == '/' || (I[0] == '.' && (I[1] == '\0' || (I[1] == '.' && (I[2] == '\0' || I[2] == '/')) || I[1] == '/'))))
+      {
+        if (AddVolatileFile(I, VolatileCmdL))
+           ;
+        else
+           _error->Error(_("Unsupported file %s given on commandline"), I);
+        return true;
+      }
+      return false;
+   });
+}
+void pkgSourceList::AddVolatileFiles(CommandLine &CmdL, std::vector<const char*> * const VolatileCmdL)
+{
+   std::remove_if(CmdL.FileList + 1, CmdL.FileList + 1 + CmdL.FileSize(), [&](char const * const I) {
+      if (I != nullptr && (I[0] == '/' || (I[0] == '.' && (I[1] == '\0' || (I[1] == '.' && (I[2] == '\0' || I[2] == '/')) || I[1] == '/'))))
+      {
+        if (AddVolatileFile(I))
+        {
+           if (VolatileCmdL != nullptr)
+              VolatileCmdL->push_back(I);
+        }
+        else
+           _error->Error(_("Unsupported file %s given on commandline"), I);
+        return true;
+      }
+      return false;
+   });

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