* merged from main

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

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 1173098d278e941092716d6b7137c8bc5854c8de..fea645078688e64caa213b6148bd204b99455199 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.23 2002/07/01 21:41:11 jgg Exp $
+// $Id: sourcelist.cc,v 1.3 2002/08/15 20:51:37 niemeyer Exp $

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


@@ -8,19 +8,22 @@
    ##################################################################### */
                                                                        /*}}}*/
 // 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>
 
 #include <apti18n.h>
 
 #include <fstream>

+
+// CNC:2003-03-03 - This is needed for ReadDir stuff.
+#include <algorithm>
+#include <stdio.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <unistd.h>

                                                                        /*}}}*/
 
 using namespace std;
                                                                        /*}}}*/
 
 using namespace std;


@@ -74,8 +77,7 @@ bool pkgSourceList::Type::FixupURI(string &URI) const
 // ---------------------------------------------------------------------
 /* This is a generic one that is the 'usual' format for sources.list
    Weird types may override this. */
 // ---------------------------------------------------------------------
 /* This is a generic one that is the 'usual' format for sources.list
    Weird types may override this. */

-bool pkgSourceList::Type::ParseLine(vector<pkgIndexFile *> &List,
-                                   Vendor const *Vendor,
+bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List,

                                    const char *Buffer,
                                    unsigned long CurLine,
                                    string File) const
                                    const char *Buffer,
                                    unsigned long CurLine,
                                    string File) const


@@ -96,9 +98,9 @@ bool pkgSourceList::Type::ParseLine(vector<pkgIndexFile *> &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,Vendor);
+      return CreateItem(List,URI,Dist,Section);

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


@@ -107,7 +109,7 @@ bool pkgSourceList::Type::ParseLine(vector<pkgIndexFile *> &List,
    
    do
    {
    
    do
    {

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

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


@@ -135,109 +137,74 @@ pkgSourceList::~pkgSourceList()
 {
    for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
       delete *I;
 {
    for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
       delete *I;

-   for (vector<Vendor const *>::const_iterator I = VendorList.begin(); 
-       I != VendorList.end(); I++)
-      delete *I;

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

-// SourceList::ReadVendors - Read list of known package vendors                /*{{{*/
+                                                                       /*}}}*/
+// SourceList::ReadMainList - Read the main source list from etc       /*{{{*/

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

-/* This also scans a directory of vendor files similar to apt.conf.d 
-   which can contain the usual suspects of distribution provided data.
-   The APT config mechanism allows the user to override these in their
-   configuration file. */
-bool pkgSourceList::ReadVendors()
+/* */
+bool pkgSourceList::ReadMainList()

 {
 {

-   Configuration Cnf;
-
-   string CnfFile = _config->FindDir("Dir::Etc::vendorparts");
-   if (FileExists(CnfFile) == true)
-      if (ReadConfigDir(Cnf,CnfFile,true) == false)
-        return false;
-   CnfFile = _config->FindFile("Dir::Etc::vendorlist");
-   if (FileExists(CnfFile) == true)
-      if (ReadConfigFile(Cnf,CnfFile,true) == false)
-        return false;
-
-   for (vector<Vendor const *>::const_iterator I = VendorList.begin(); 
-       I != VendorList.end(); I++)
-      delete *I;
-   VendorList.erase(VendorList.begin(),VendorList.end());
-   
-   // Process 'simple-key' type sections
-   const Configuration::Item *Top = Cnf.Tree("simple-key");
-   for (Top = (Top == 0?0:Top->Child); Top != 0; Top = Top->Next)
-   {
-      Configuration Block(Top);
-      Vendor *Vendor;
-      
-      Vendor = new pkgSourceList::Vendor;
-      
-      Vendor->VendorID = Top->Tag;
-      Vendor->FingerPrint = Block.Find("Fingerprint");
-      Vendor->Description = Block.Find("Name");
-      
-      if (Vendor->FingerPrint.empty() == true || 
-         Vendor->Description.empty() == true)
-      {
-         _error->Error(_("Vendor block %s is invalid"), Vendor->VendorID.c_str());
-        delete Vendor;
-        continue;
-      }
-      
-      VendorList.push_back(Vendor);
-   }
+   // CNC:2003-03-03 - Multiple sources list support.
+   bool Res = true;
+#if 0
+   Res = ReadVendors();
+   if (Res == false)
+      return false;
+#endif

 
 

-   /* XXX Process 'group-key' type sections
-      This is currently faked out so that the vendors file format is
-      parsed but nothing is done with it except check for validity */
-   Top = Cnf.Tree("group-key");
-   for (Top = (Top == 0?0:Top->Child); Top != 0; Top = Top->Next)
-   {
-      Configuration Block(Top);
-      Vendor *Vendor;
-      
-      Vendor = new pkgSourceList::Vendor;
-      
-      Vendor->VendorID = Top->Tag;
-      Vendor->Description = Block.Find("Name");
+   Reset();
+   // CNC:2003-11-28 - Entries in sources.list have priority over
+   //                  entries in sources.list.d.
+   string Main = _config->FindFile("Dir::Etc::sourcelist");
+   if (FileExists(Main) == true)
+      Res &= ReadAppend(Main);   

 
 

-      if (Vendor->Description.empty() == true)
-      {
-         _error->Error(_("Vendor block %s is invalid"), 
-                      Vendor->VendorID.c_str());
-        delete Vendor;
-        continue;
-      }
-      
-      VendorList.push_back(Vendor);
-   }
+   string Parts = _config->FindDir("Dir::Etc::sourceparts");
+   if (FileExists(Parts) == true)
+      Res &= ReadSourceDir(Parts);

    
    

-   return !_error->PendingError();
+   return Res;

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

-// SourceList::ReadMainList - Read the main source list from etc       /*{{{*/
+// CNC:2003-03-03 - Needed to preserve backwards compatibility.
+// SourceList::Reset - Clear the sourcelist contents                   /*{{{*/

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

-bool pkgSourceList::ReadMainList()
+void pkgSourceList::Reset()

 {
 {

-   return ReadVendors() && Read(_config->FindFile("Dir::Etc::sourcelist"));
+   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)


@@ -245,10 +212,16 @@ bool pkgSourceList::Read(string File)
       F.getline(Buffer,sizeof(Buffer));
       CurLine++;
       _strtabexpand(Buffer,sizeof(Buffer));
       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());
+

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


@@ -264,10 +237,9 @@ bool pkgSourceList::Read(string File)
 
       Type *Parse = Type::GetType(LineType.c_str());
       if (Parse == 0)
 
       Type *Parse = Type::GetType(LineType.c_str());
       if (Parse == 0)

-        return _error->Error(_("Type '%s' is not known in on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str());
+        return _error->Error(_("Type '%s' is not known on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str());

       
       

-      // Authenticated repository
-      Vendor const *Vndr = 0;
+      // Vendor name specified

       if (C[0] == '[')
       {
         string VendorID;
       if (C[0] == '[')
       {
         string VendorID;


@@ -279,22 +251,24 @@ bool pkgSourceList::Read(string File)
             return _error->Error(_("Malformed line %u in source list %s (vendor id)"),CurLine,File.c_str());
         VendorID = string(VendorID,1,VendorID.size()-2);
         
             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<Vendor const *>::const_iterator iter = VendorList.begin();
-             iter != VendorList.end(); iter++) 
-        {
-           if ((*iter)->VendorID == VendorID)
-           {
-              Vndr = *iter;
-              break;
-           }
-        }
+//      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 (Vndr == 0)
-           return _error->Error(_("Unknown vendor ID '%s' in line %u of source list %s"),
-                                VendorID.c_str(),CurLine,File.c_str());
+//      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,Vndr,C,CurLine,File) == false)
+
+      if (Parse->ParseLine(SrcList,C,CurLine,File) == false)

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


@@ -308,24 +282,81 @@ bool pkgSourceList::FindIndex(pkgCache::PkgFileIterator File,
 {
    for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
    {
 {
    for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
    {

-      if ((*I)->FindInCache(*File.Cache()) == File)
+      vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
+      for (vector<pkgIndexFile *>::const_iterator J = Indexes->begin();
+          J != Indexes->end(); J++)

       {
       {

-        Found = *I;
-        return true;
+         if ((*J)->FindInCache(*File.Cache()) == File)
+         {
+            Found = (*J);
+            return true;
+         }

       }
    }
       }
    }

-   
+

    return false;
 }
                                                                        /*}}}*/
 // SourceList::GetIndexes - Load the index files into the downloader   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
    return false;
 }
                                                                        /*}}}*/
 // SourceList::GetIndexes - Load the index files into the downloader   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool pkgSourceList::GetIndexes(pkgAcquire *Owner) const
+bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const

 {
    for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
 {
    for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)

-      if ((*I)->GetIndexes(Owner) == false)
+      if ((*I)->GetIndexes(Owner,GetAll) == false)

         return false;
    return true;
 }
                                                                        /*}}}*/
         return false;
    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)
+{
+   DIR *D = opendir(Dir.c_str());
+   if (D == 0)
+      return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
+
+   vector<string> List;
+   
+   for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D))
+   {
+      if (Ent->d_name[0] == '.')
+        continue;
+
+      // CNC:2003-12-02 Only accept .list files as valid sourceparts
+      if (flExtension(Ent->d_name) != "list")
+        continue;
+      
+      // Skip bad file names ala run-parts
+      const char *C = Ent->d_name;
+      for (; *C != 0; C++)
+        if (isalpha(*C) == 0 && isdigit(*C) == 0
+             && *C != '_' && *C != '-' && *C != '.')
+           break;
+      if (*C != 0)
+        continue;
+      
+      // Make sure it is a file and not something else
+      string File = flCombine(Dir,Ent->d_name);
+      struct stat St;
+      if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0)
+        continue;
+      
+      List.push_back(File);      
+   }   
+   closedir(D);
+   
+   sort(List.begin(),List.end());
+
+   // Read the files
+   for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)
+      if (ReadAppend(*I) == false)
+        return false;
+   return true;
+
+}
+                                                                       /*}}}*/
+