* merge the remaining Ubuntu change:

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

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index bea2d91c82f8dff333f756c998063e4ce2ec8a9b..c3ec9865a5b12691a8b32f6b62b2af0185eb364f 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.12 1999/03/05 19:36:49 jgg Exp $
+// $Id: sourcelist.cc,v 1.3 2002/08/15 20:51:37 niemeyer Exp $

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


@@ -8,328 +8,337 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/sourcelist.h"
-#endif
-

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

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

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

+#include <apt-pkg/configuration.h>
+
+#include <apti18n.h>

 
 

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

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

-// SourceList::pkgSourceList - Constructors                            /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgSourceList::pkgSourceList()
-{
-}
+using namespace std;

 
 

-pkgSourceList::pkgSourceList(string File)
+// Global list of Items supported
+static  pkgSourceList::Type *ItmList[10];
+pkgSourceList::Type **pkgSourceList::Type::GlobalList = ItmList;
+unsigned long pkgSourceList::Type::GlobalListLen = 0;
+
+// Type::Type - Constructor                                            /*{{{*/
+// ---------------------------------------------------------------------
+/* Link this to the global list of items*/
+pkgSourceList::Type::Type()

 {
 {

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

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

-// 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->FindFile("Dir::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;
+}
+                                                                       /*}}}*/
+// 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 long const &CurLine,
+                                   string const &File) const
+{
+   for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces

 
 

-   int CurLine = 0;
-   while (F.eof() == false)
+   // Parse option field if it exists
+   // e.g.: [ option1=value1 option2=value2 ]
+   map<string, string> Options;
+   if (Buffer != 0 && Buffer[0] == '[')

    {
    {

-      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] == '/')
+      ++Buffer; // ignore the [
+      for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces
+      while (*Buffer != ']')

       {
       {

-        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;
+        // get one option, e.g. option1=value1
+        string option;
+        if (ParseQuoteWord(Buffer,option) == false)
+           return _error->Error(_("Malformed line %lu in source list %s ([option] unparseable)"),CurLine,File.c_str());
+
+        if (option.length() < 3)
+           return _error->Error(_("Malformed line %lu in source list %s ([option] too short)"),CurLine,File.c_str());
+
+        // 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 line %lu in source list %s ([%s] is not an assignment)"),CurLine,File.c_str(), option.c_str());
+
+        string const key = string(option, 0, needle);
+        string const value = string(option, needle + 1, option.length());
+
+        if (key.empty() == true)
+           return _error->Error(_("Malformed line %lu in source list %s ([%s] has no key)"),CurLine,File.c_str(), option.c_str());
+
+        if (value.empty() == true)
+           return _error->Error(_("Malformed line %lu in source list %s ([%s] key %s has no value)"),CurLine,File.c_str(),option.c_str(),key.c_str());
+
+        Options[key] = value;

       }
       }

+      ++Buffer; // ignore the ]
+      for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces
+   }
+
+   string URI;
+   string Dist;
+   string Section;

 
 

-      // 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());
+   if (ParseQuoteWord(Buffer,URI) == false)
+      return _error->Error(_("Malformed line %lu in source list %s (URI)"),CurLine,File.c_str());
+   if (ParseQuoteWord(Buffer,Dist) == false)
+      return _error->Error(_("Malformed line %lu in source list %s (dist)"),CurLine,File.c_str());

       
       

-      do
-      {
-        List.push_back(Itm);
-      }
-      while (ParseQuoteWord(C,Itm.Section) == true);
+   if (FixupURI(URI) == false)
+      return _error->Error(_("Malformed line %lu in source list %s (URI parse)"),CurLine,File.c_str());
+   
+   // Check for an absolute dists specification.
+   if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
+   {
+      if (ParseQuoteWord(Buffer,Section) == true)
+        return _error->Error(_("Malformed line %lu in source list %s (absolute dist)"),CurLine,File.c_str());
+      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 line %lu in source list %s (dist parse)"),CurLine,File.c_str());
+   
+   do
+   {
+      if (CreateItem(List, URI, Dist, Section, Options) == false)
+        return false;
+   }
+   while (ParseQuoteWord(Buffer,Section) == true);
+   

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

-// SourceList::Item << - Writes the item to a stream                   /*{{{*/
+
+// SourceList::pkgSourceList - Constructors                            /*{{{*/

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

-/* This is not suitable for rebuilding the sourcelist file but it good for
-   debugging. */
-ostream &operator <<(ostream &O,pkgSourceList::Item &Itm)
+/* */
+pkgSourceList::pkgSourceList()

 {
 {

-   O << (int)Itm.Type << ' ' << Itm.URI << ' ' << Itm.Dist << ' ' << Itm.Section;
-   return O;
+}
+
+pkgSourceList::pkgSourceList(string File)
+{
+   Read(File);

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

-// SourceList::Item::SetType - Sets the distribution type              /*{{{*/
+// SourceList::~pkgSourceList - Destructor                             /*{{{*/

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

-bool pkgSourceList::Item::SetType(string S)
+pkgSourceList::~pkgSourceList()

 {
 {

-   if (S == "deb")
-   {
-      Type = Deb;
-      return true;
-   }
-
-   if (S == "deb-src")
-   {
-      Type = DebSrc;
-      return true;
-   }
-
-   return false;
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
+      delete *I;

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

-// SourceList::Item::SetURI - Set the URI                              /*{{{*/
+                                                                       /*}}}*/
+// SourceList::ReadMainList - Read the main source list from etc       /*{{{*/

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

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

 {
 {

-   if (S.empty() == true)
-      return false;
-
-   if (S.find(':') == string::npos)
+   // CNC:2003-03-03 - Multiple sources list support.
+   bool Res = true;
+#if 0
+   Res = ReadVendors();
+   if (Res == false)

       return false;
       return false;

+#endif

 
 

-   S = SubstVar(S,"$(ARCH)",_config->Find("APT::Architecture"));
+   Reset();
+   // CNC:2003-11-28 - Entries in sources.list have priority over
+   //                  entries in sources.list.d.
+   string Main = _config->FindFile("Dir::Etc::sourcelist");
+   string Parts = _config->FindDir("Dir::Etc::sourceparts");

    
    

-   // Make sure that the URN is / postfixed
-   URI = S;
-   if (URI[URI.size() - 1] != '/')
-      URI += '/';
-   
-   return true;
+   if (FileExists(Main) == true)
+      Res &= ReadAppend(Main);
+   else if (DirectoryExists(Parts) == 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 (FileExists(Main) == false)
+      // Only warn if there is no sources.list file.
+      _error->WarningE("FileExists", _("Unable to read %s"), Main.c_str());
+
+   return Res;

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

-// SourceList::Item::PackagesURI - Returns a URI to the packages file  /*{{{*/
+// CNC:2003-03-03 - Needed to preserve backwards compatibility.
+// SourceList::Reset - Clear the sourcelist contents                   /*{{{*/

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

-string pkgSourceList::Item::PackagesURI() const
+void pkgSourceList::Reset()

 {
 {

-   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;
-      
-      case DebSrc:
-      if (Dist[Dist.size() - 1] == '/')
-        Res = URI + Dist;
-      else
-        Res = URI + "dists/" + Dist + '/' + Section +
-        "/source/";
-      
-      Res += "Sources";
-      break;
-   };
-   return Res;
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
+      delete *I;
+   SrcList.erase(SrcList.begin(),SrcList.end());

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

-// SourceList::Item::PackagesInfo - Shorter version of the URI         /*{{{*/
+// CNC:2003-03-03 - Function moved to ReadAppend() and Reset().
+// SourceList::Read - Parse the sourcelist file                                /*{{{*/

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

-/* This is a shorter version that is designed to be < 60 chars or so */
-string pkgSourceList::Item::PackagesInfo() const
+/* */
+bool pkgSourceList::Read(string File)

 {
 {

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

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

-// SourceList::Item::ReleaseURI - Returns a URI to the release file    /*{{{*/
+// SourceList::ReadAppend - Parse a sourcelist file                    /*{{{*/

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

-string pkgSourceList::Item::ReleaseURI() const
+bool pkgSourceList::ReadAppend(string File)

 {
 {

-   string Res;
-   switch (Type)
+   // 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 0 // Now Reset() does this.
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
+      delete *I;
+   SrcList.erase(SrcList.begin(),SrcList.end());
+#endif
+   // CNC:2003-12-10 - 300 is too short.
+   char Buffer[1024];
+
+   int CurLine = 0;
+   while (F.eof() == false)

    {
    {

-      case Deb:
-      if (Dist[Dist.size() - 1] == '/')
-        Res = URI + Dist;
-      else
-        Res = URI + "dists/" + Dist + '/' + Section +
-        "/binary-" + _config->Find("APT::Architecture") + '/';
+      F.getline(Buffer,sizeof(Buffer));
+      CurLine++;
+      _strtabexpand(Buffer,sizeof(Buffer));
+      if (F.fail() && !F.eof())
+        return _error->Error(_("Line %u too long in source list %s."),
+                             CurLine,File.c_str());
+

       
       

-      Res += "Release";
-      break;
+      char *I;
+      // CNC:2003-02-20 - Do not break if '#' is inside [].
+      for (I = Buffer; *I != 0 && *I != '#'; I++)
+         if (*I == '[')
+           for (I++; *I != 0 && *I != ']'; I++);
+      *I = 0;

       
       

-      case DebSrc:
-      if (Dist[Dist.size() - 1] == '/')
-        Res = URI + Dist;
-      else
-        Res = URI + "dists/" + Dist + '/' + Section +
-        "/source/";
+      const char *C = _strstrip(Buffer);

       
       

-      Res += "Release";
-      break;
-   };
-   return Res;
-}
-                                                                       /*}}}*/
-// SourceList::Item::ReleaseInfo - Shorter version of the URI          /*{{{*/
-// ---------------------------------------------------------------------
-/* This is a shorter version that is designed to be < 60 chars or so */
-string pkgSourceList::Item::ReleaseInfo() const
-{
-   string Res;
-   switch (Type)
-   {
-      case Deb:
-      case DebSrc:
-      Res += SiteOnly(URI) + ' ';
-      if (Dist[Dist.size() - 1] == '/')
-        Res += Dist;
-      else
-        Res += Dist + '/' + Section;
+      // Comment or blank
+      if (C[0] == '#' || C[0] == 0)
+        continue;
+           
+      // Grok it
+      string LineType;
+      if (ParseQuoteWord(C,LineType) == false)
+        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());

       
       

-      Res += " Release";
-      break;
-   };
-   return Res;
+      if (Parse->ParseLine(SrcList, C, CurLine, File) == false)
+        return false;
+   }
+   return true;

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

-// SourceList::Item::ArchiveInfo - Shorter version of the archive spec /*{{{*/
+// SourceList::FindIndex - Get the index associated with a file                /*{{{*/

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

-/* This is a shorter version that is designed to be < 60 chars or so */
-string pkgSourceList::Item::ArchiveInfo(pkgCache::VerIterator Ver) const
+/* */
+bool pkgSourceList::FindIndex(pkgCache::PkgFileIterator File,
+                             pkgIndexFile *&Found) const

 {
 {

-   string Res;
-   switch (Type)
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)

    {
    {

-      case DebSrc:
-      case Deb:
-      Res += SiteOnly(URI) + ' ';
-      if (Dist[Dist.size() - 1] == '/')
-        Res += Dist;
-      else
-        Res += Dist + '/' + Section;
-      
-      Res += " ";
-      Res += Ver.ParentPkg().Name();
-      Res += " ";
-      Res += Ver.VerStr();
-      
-      break;
-   };
-   return Res;
+      vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
+      for (vector<pkgIndexFile *>::const_iterator J = Indexes->begin();
+          J != Indexes->end(); J++)
+      {
+         if ((*J)->FindInCache(*File.Cache()) == File)
+         {
+            Found = (*J);
+            return true;
+         }
+      }
+   }
+
+   return false;

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

-// SourceList::Item::ArchiveURI - Returns a URI to the given archive   /*{{{*/
+// SourceList::GetIndexes - Load the index files into the downloader   /*{{{*/

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

-string pkgSourceList::Item::ArchiveURI(string File) const
+bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const

 {
 {

-   string Res;
-   switch (Type)
-   {
-      case Deb:
-      case DebSrc:
-      Res = URI + File;
-      break;
-   };
-   return Res;
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
+      if ((*I)->GetIndexes(Owner,GetAll) == false)
+        return false;
+   return true;

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

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

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

-string pkgSourceList::Item::SiteOnly(string URI) const
+bool pkgSourceList::ReadSourceDir(string Dir)

 {
 {

-   unsigned int Pos = URI.find(':');
-   if (Pos == string::npos || Pos + 3 > URI.length())
-      return URI;
-   if (URI[Pos + 1] != '/' || URI[Pos + 2] != '/')
-      return URI;
+   vector<string> const List = GetListOfFilesInDir(Dir, "list", true);
+
+   // Read the files
+   for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)
+      if (ReadAppend(*I) == false)
+        return false;
+   return true;

 
 

-   Pos = URI.find('/',Pos + 3);
-   if (Pos == string::npos)
-      return URI;
-   return string(URI,0,Pos);

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

+