* merge the remaining Ubuntu change:

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

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index e32d804ce0298adbe06c860890cbd16218b9aa90..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.25 2004/06/07 23:08:00 mdz Exp $
+// $Id: sourcelist.cc,v 1.3 2002/08/15 20:51:37 niemeyer Exp $

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


@@ -8,10 +8,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // 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>


@@ -76,13 +72,58 @@ bool pkgSourceList::Type::FixupURI(string &URI) const
    Weird types may override this. */
 bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List,
                                    const char *Buffer,
    Weird types may override this. */
 bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List,
                                    const char *Buffer,

-                                   unsigned long CurLine,
-                                   string File) const
+                                   unsigned long const &CurLine,
+                                   string const &File) const

 {
 {

+   for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces
+
+   // Parse option field if it exists
+   // e.g.: [ option1=value1 option2=value2 ]
+   map<string, string> Options;
+   if (Buffer != 0 && Buffer[0] == '[')
+   {
+      ++Buffer; // ignore the [
+      for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces
+      while (*Buffer != ']')
+      {
+        // 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 URI;
    string Dist;

-   string Section;   
-   
+   string Section;
+

    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)
    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)


@@ -95,9 +136,9 @@ bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List,
    if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
    {
       if (ParseQuoteWord(Buffer,Section) == true)
    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());
+        return _error->Error(_("Malformed line %lu in source list %s (absolute dist)"),CurLine,File.c_str());

       Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));
       Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));

-      return CreateItem(List,URI,Dist,Section);
+      return CreateItem(List, URI, Dist, Section, Options);

    }
    
    // Grab the rest of the dists
    }
    
    // Grab the rest of the dists


@@ -106,7 +147,7 @@ bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List,
    
    do
    {
    
    do
    {

-      if (CreateItem(List,URI,Dist,Section) == false)
+      if (CreateItem(List, URI, Dist, Section, Options) == false)

         return false;
    }
    while (ParseQuoteWord(Buffer,Section) == true);
         return false;
    }
    while (ParseQuoteWord(Buffer,Section) == true);


@@ -142,23 +183,73 @@ pkgSourceList::~pkgSourceList()
 /* */
 bool pkgSourceList::ReadMainList()
 {
 /* */
 bool pkgSourceList::ReadMainList()
 {

-   return Read(_config->FindFile("Dir::Etc::sourcelist"));
+   // 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");
+   string Parts = _config->FindDir("Dir::Etc::sourceparts");
+   
+   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;
+}
+                                                                       /*}}}*/
+// CNC:2003-03-03 - Needed to preserve backwards compatibility.
+// SourceList::Reset - Clear the sourcelist contents                   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgSourceList::Reset()
+{
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
+      delete *I;
+   SrcList.erase(SrcList.begin(),SrcList.end());

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

+// CNC:2003-03-03 - Function moved to ReadAppend() and Reset().

 // SourceList::Read - Parse the sourcelist file                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool pkgSourceList::Read(string File)
 // SourceList::Read - Parse the sourcelist file                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool pkgSourceList::Read(string File)

+{
+   Reset();
+   return ReadAppend(File);
+}
+                                                                       /*}}}*/
+// SourceList::ReadAppend - Parse a sourcelist file                    /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::ReadAppend(string File)

 {
    // 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());
    
 {
    // 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());
    for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
       delete *I;
    SrcList.erase(SrcList.begin(),SrcList.end());

-   char Buffer[300];
+#endif
+   // CNC:2003-12-10 - 300 is too short.
+   char Buffer[1024];

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


@@ -172,7 +263,10 @@ bool pkgSourceList::Read(string File)
 
       
       char *I;
 
       
       char *I;

-      for (I = Buffer; *I != 0 && *I != '#'; 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;
       
       const char *C = _strstrip(Buffer);
       *I = 0;
       
       const char *C = _strstrip(Buffer);


@@ -190,36 +284,7 @@ bool pkgSourceList::Read(string File)
       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 == 0)
         return _error->Error(_("Type '%s' is not known on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str());
       

-      // Vendor name specified
-      if (C[0] == '[')
-      {
-        string VendorID;
-        
-        if (ParseQuoteWord(C,VendorID) == false)
-            return _error->Error(_("Malformed line %u in source list %s (vendor id)"),CurLine,File.c_str());
-
-        if (VendorID.length() < 2 || VendorID.end()[-1] != ']')
-            return _error->Error(_("Malformed line %u in source list %s (vendor id)"),CurLine,File.c_str());
-        VendorID = string(VendorID,1,VendorID.size()-2);
-        
-//      for (vector<const Vendor *>::const_iterator iter = VendorList.begin();
-//           iter != VendorList.end(); iter++) 
-//      {
-//         if ((*iter)->GetVendorID() == VendorID)
-//         {
-//           if (_config->FindB("Debug::sourceList", false)) 
-//             std::cerr << "Comparing VendorID \"" << VendorID << "\" with \"" << (*iter)->GetVendorID() << '"' << std::endl;
-//            Verifier = *iter;
-//            break;
-//         }
-//      }
-
-//      if (Verifier == 0)
-//         return _error->Error(_("Unknown vendor ID '%s' in line %u of source list %s"),
-//                              VendorID.c_str(),CurLine,File.c_str());
-      }
-
-      if (Parse->ParseLine(SrcList,C,CurLine,File) == false)
+      if (Parse->ParseLine(SrcList, C, CurLine, File) == false)

         return false;
    }
    return true;
         return false;
    }
    return true;


@@ -259,3 +324,21 @@ bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+// CNC:2003-03-03 - By Anton V. Denisov <avd@altlinux.org>.
+// SourceList::ReadSourceDir - Read a directory with sources files
+// Based on ReadConfigDir()                                            /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::ReadSourceDir(string Dir)
+{
+   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;
+
+}
+                                                                       /*}}}*/
+