G++3 fixes from Randolph

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

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index f9de995848ea3f07321fe267d2538f31d3439450..51289a43d1af6da05f3765c6af2145ce4b97d6d2 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.3 1998/07/12 23:58:36 jgg Exp $
+// $Id: sourcelist.cc,v 1.19 2001/03/13 06:51:46 jgg Exp $

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


@@ -16,12 +16,102 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>

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

 
 #include <fstream.h>
 
 #include <fstream.h>

-#include <stdio.h>
-#include <unistd.h>
-#include <sys/stat.h>
+                                                                       /*}}}*/
+
+// Global list of Item 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()
+{
+   ItmList[GlobalListLen] = this;
+   GlobalListLen++;
+}
+                                                                       /*}}}*/
+// Type::GetType - Get a specific meta for a given type                        /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgSourceList::Type *pkgSourceList::Type::GetType(const char *Type)
+{
+   for (unsigned I = 0; I != GlobalListLen; I++)
+      if (strcmp(GlobalList[I]->Name,Type) == 0)
+        return GlobalList[I];
+   return 0;
+}
+                                                                       /*}}}*/
+// Type::FixupURI - Normalize the URI and check it..                   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::Type::FixupURI(string &URI) const
+{
+   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 += '/';
+   
+   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<pkgIndexFile *> &List,
+                                   Vendor const *Vendor,
+                                   const char *Buffer,
+                                   unsigned long CurLine,
+                                   string File) const
+{
+   string URI;
+   string Dist;
+   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)
+      return _error->Error(_("Malformed line %lu in source list %s (dist)"),CurLine,File.c_str());
+      
+   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,Vendor);
+   }
+   
+   // 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,Vendor) == false)
+        return false;
+   }
+   while (ParseQuoteWord(Buffer,Section) == true);
+   
+   return true;
+}

                                                                        /*}}}*/
 
 // SourceList::pkgSourceList - Constructors                            /*{{{*/
                                                                        /*}}}*/
 
 // SourceList::pkgSourceList - Constructors                            /*{{{*/


@@ -36,12 +126,58 @@ pkgSourceList::pkgSourceList(string File)
    Read(File);
 }
                                                                        /*}}}*/
    Read(File);
 }
                                                                        /*}}}*/

+// SourceList::ReadVendors - Read list of known package vendors                /*{{{*/
+// ---------------------------------------------------------------------
+/* 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()
+{
+   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;
+
+   // 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);
+   }
+
+   return !_error->PendingError();
+}
+                                                                       /*}}}*/

 // SourceList::ReadMainList - Read the main source list from etc       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool pkgSourceList::ReadMainList()
 {
 // SourceList::ReadMainList - Read the main source list from etc       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool pkgSourceList::ReadMainList()
 {

-   return Read(_config->Find("APT::Etc:sourcelist"));
+   return ReadVendors() && Read(_config->FindFile("Dir::Etc::sourcelist"));

 }
                                                                        /*}}}*/
 // SourceList::Read - Parse the sourcelist file                                /*{{{*/
 }
                                                                        /*}}}*/
 // SourceList::Read - Parse the sourcelist file                                /*{{{*/


@@ -52,9 +188,9 @@ bool pkgSourceList::Read(string File)
    // Open the stream for reading
    ifstream F(File.c_str(),ios::in | ios::nocreate);
    if (!F != 0)
    // 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());
+      return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str());

    
    

-   List.erase(List.begin(),List.end());
+   SrcList.erase(SrcList.begin(),SrcList.end());

    char Buffer[300];
 
    int CurLine = 0;
    char Buffer[300];
 
    int CurLine = 0;


@@ -63,228 +199,87 @@ 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));

-      _strstrip(Buffer);
+      
+      
+      char *I;
+      for (I = Buffer; *I != 0 && *I != '#'; I++);
+      *I = 0;
+      
+      const char *C = _strstrip(Buffer);

       
       // Comment or blank
       
       // Comment or blank

-      if (Buffer[0] == '#' || Buffer[0] == 0)
+      if (C[0] == '#' || C[0] == 0)

         continue;
         continue;

-      
+           

       // Grok it
       // 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());
+      string LineType;
+      if (ParseQuoteWord(C,LineType) == false)
+        return _error->Error(_("Malformed line %u in source list %s (type)"),CurLine,File.c_str());

 
 

-      // Check for an absolute dists specification.
-      if (Itm.Dist.empty() == false && Itm.Dist[Itm.Dist.size() - 1] == '/')
-      {
-        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;
-      }
-
-      // 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());
+      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());

       
       

-      do
+      // Authenticated repository
+      Vendor const *Vndr = 0;
+      if (C[0] == '[')

       {
       {

-        List.push_back(Itm);
+        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<Vendor const *>::const_iterator iter = VendorList.begin();
+             iter != VendorList.end(); iter++) 
+        {
+           if ((*iter)->VendorID == VendorID)
+           {
+              Vndr = *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());

       }
       }

-      while (ParseQuoteWord(C,Itm.Section) == true);
+      
+      if (Parse->ParseLine(SrcList,Vndr,C,CurLine,File) == false)
+        return false;

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

-// SourceList::SanitizeURI - Hash the uri                              /*{{{*/
-// ---------------------------------------------------------------------
-/* 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)
-{
-   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   /*{{{*/
-// ---------------------------------------------------------------------
-/* This will return List.end() if it could not find the matching 
-   file */
-pkgSourceList::const_iterator pkgSourceList::MatchPkgFile(pkgCache::VerIterator Ver)
-{
-   string Base = _config->Find("APT::Architecture");
-   for (const_iterator I = List.begin(); I != List.end(); I++)
-   {
-      string URI = I->PackagesURI();
-      switch (I->Type)
-      {
-        case Item::Deb:
-/*      if (Base + SanitizeURI(URI) == Ver.File().FileName())
-           return I;*/
-        break;
-      };      
-   }
-   return List.end();
-}
-                                                                       /*}}}*/
-// SourceList::Item << - Writes the item to a stream                   /*{{{*/
-// ---------------------------------------------------------------------
-/* This is not suitable for rebuilding the sourcelist file but it good for
-   debugging. */
-ostream &operator <<(ostream &O,pkgSourceList::Item &Itm)
-{
-   O << Itm.Type << ' ' << Itm.URI << ' ' << Itm.Dist << ' ' << Itm.Section;
-   return O;
-}
-                                                                       /*}}}*/
-// SourceList::Item::SetType - Sets the distribution type              /*{{{*/
+// SourceList::FindIndex - Get the index associated with a file                /*{{{*/

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

-bool pkgSourceList::Item::SetType(string S)
+bool pkgSourceList::FindIndex(pkgCache::PkgFileIterator File,
+                             pkgIndexFile *&Found) const

 {
 {

-   if (S == "deb")
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)

    {
    {

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

    }
    }

-
-   return true;
-}
-                                                                       /*}}}*/
-// SourceList::Item::SetURI - Set the URI                              /*{{{*/
-// ---------------------------------------------------------------------
-/* For simplicity we strip the scheme off the uri */
-bool pkgSourceList::Item::SetURI(string S)
-{
-   if (S.empty() == true)
-      return false;
-
-   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 += '/';
-   
-   return true;
+   return false;

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

-// SourceList::Item::PackagesURI - Returns a URI to the packages file  /*{{{*/
+// SourceList::GetIndexes - Load the index files into the downloader   /*{{{*/

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

-string pkgSourceList::Item::PackagesURI() const
-{
-   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;
-}
-                                                                       /*}}}*/
-// 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
-{
-   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;
-}
-                                                                       /*}}}*/
-// 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
+bool pkgSourceList::GetIndexes(pkgAcquire *Owner) const

 {
 {

-   string Res;
-   switch (Type)
-   {
-      case Deb:
-      Res += SiteOnly(URI) + ' ';
-      if (Dist[Dist.size() - 1] == '/')
-        Res += Dist;
-      else
-        Res += Dist + '/' + Section;
-      
-      Res += " ";
-      Res += Ver.ParentPkg().Name();
-      break;
-   };
-   return Res;
-}
-                                                                       /*}}}*/
-// SourceList::Item::ArchiveURI - Returns a URI to the given archive   /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string pkgSourceList::Item::ArchiveURI(string File) const
-{
-   string Res;
-   switch (Type)
-   {
-      case Deb:
-      Res = URI + File;
-      break;
-   };
-   return Res;
-}
-                                                                       /*}}}*/
-// SourceList::Item::SiteOnly - Strip off the path part of a URI       /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string pkgSourceList::Item::SiteOnly(string URI) const
-{
-   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);
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
+      if ((*I)->GetIndexes(Owner) == false)
+        return false;
+   return true;

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