X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/6c139d6e362f04a1582e8a8f511f8aeab031fecf..127e6df37213a1fda0dd5b44182acf678ccbbf02:/apt-pkg/sourcelist.cc?ds=sidebyside diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 62d5e6fcd..929259961 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: sourcelist.cc,v 1.1 1998/07/07 04:17:06 jgg Exp $ +// $Id: sourcelist.cc,v 1.3 2002/08/15 20:51:37 niemeyer Exp $ /* ###################################################################### List of Sources @@ -8,458 +8,321 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "pkglib/sourcelist.h" -#endif +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include +#include -#include -#include -#include -#include +#include /*}}}*/ -// 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(PKG_DEB_CF_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()); - - List.erase(List.begin(),List.end()); - char Buffer[300]; - - 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()); + if (URI.empty() == true) + return false; - // 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)",PKG_DEB_ARCH); - List.push_back(Itm); - continue; - } + if (URI.find(':') == string::npos) + return false; - // 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 - { - List.push_back(Itm); - } - while (ParseQuoteWord(C,Itm.Section) == true); - } + URI = SubstVar(URI,"$(ARCH)",_config->Find("APT::Architecture")); + + // Make sure that the URI is / postfixed + if (URI[URI.size() - 1] != '/') + URI += '/'; + 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 /*{{{*/ +// Type::ParseLine - Parse a single line /*{{{*/ // --------------------------------------------------------------------- -/* This will return List.end() if it could not find the matching - file */ -pkgSourceList::const_iterator pkgSourceList::MatchPkgFile(pkgCache::VerIterator Ver) +/* This is a generic one that is the 'usual' format for sources.list + Weird types may override this. */ +bool pkgSourceList::Type::ParseLine(vector &List, + const char *Buffer, + unsigned long CurLine, + string File) const { - string Base = PKG_DEB_ST_LIST; - for (const_iterator I = List.begin(); I != List.end(); I++) + 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] == '/') { - string URI = I->PackagesURI(); - switch (I->Type) - { - case Item::Deb: - if (Base + SanitizeURI(URI) == Ver.File().FileName()) - return I; - break; - }; + 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); } - 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 /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool pkgSourceList::Item::SetType(string S) -{ - if (S == "deb") + + // 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 { - Type = Deb; - return true; + if (CreateItem(List,URI,Dist,Section) == false) + return false; } - - 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)",PKG_DEB_ARCH); - - // Make sure that the URN is / postfixed - URI = S; - if (URI[URI.size() - 1] != '/') - URI += '/'; + while (ParseQuoteWord(Buffer,Section) == true); return true; } /*}}}*/ -// SourceList::Item::PackagesURI - Returns a URI to the packages file /*{{{*/ + +// SourceList::pkgSourceList - Constructors /*{{{*/ // --------------------------------------------------------------------- /* */ -string pkgSourceList::Item::PackagesURI() const +pkgSourceList::pkgSourceList() { - string Res; - switch (Type) - { - case Deb: - if (Dist[Dist.size() - 1] == '/') - Res = URI + Dist; - else - Res = URI + "dists/" + Dist + '/' + Section + - "/binary-" + PKG_DEB_ARCH + '/'; - - 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 + +pkgSourceList::pkgSourceList(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; - }; - return Res; + Read(File); } /*}}}*/ -// SourceList::Item::ArchiveInfo - Shorter version of the archive spec /*{{{*/ +// SourceList::~pkgSourceList - Destructor /*{{{*/ // --------------------------------------------------------------------- -/* This is a shorter version that is designed to be < 60 chars or so */ -string pkgSourceList::Item::ArchiveInfo(pkgCache::VerIterator Ver) const +/* */ +pkgSourceList::~pkgSourceList() { - 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; + for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++) + delete *I; } /*}}}*/ -// SourceList::Item::ArchiveURI - Returns a URI to the given archive /*{{{*/ + /*}}}*/ +// SourceList::ReadMainList - Read the main source list from etc /*{{{*/ // --------------------------------------------------------------------- /* */ -string pkgSourceList::Item::ArchiveURI(string File) const +bool pkgSourceList::ReadMainList() { - string Res; - switch (Type) - { - case Deb: - Res = URI + File; - break; - }; + // 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 (FileExists(Parts) == false) + // Only warn if there are no sources.list.d. + _error->WarningE("FileExists",_("Unable to read %s"),Main.c_str()); + + if (FileExists(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"),Parts.c_str()); + return Res; } /*}}}*/ -// SourceList::Item::SiteOnly - Strip off the path part of a URI /*{{{*/ +// CNC:2003-03-03 - Needed to preserve backwards compatibility. +// SourceList::Reset - Clear the sourcelist contents /*{{{*/ // --------------------------------------------------------------------- /* */ -string pkgSourceList::Item::SiteOnly(string URI) const +void pkgSourceList::Reset() { - 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++) + delete *I; + SrcList.erase(SrcList.begin(),SrcList.end()); } /*}}}*/ - -// UpdateMeta - Update the meta information /*{{{*/ +// CNC:2003-03-03 - Function moved to ReadAppend() and Reset(). +// SourceList::Read - Parse the sourcelist file /*{{{*/ // --------------------------------------------------------------------- -/* The meta information is package files, revision information and mirror - lists. */ -bool pkgUpdateMeta(pkgSourceList &List,pkgAquire &Engine) +/* */ +bool pkgSourceList::Read(string File) { - if (Engine.OutputDir(PKG_DEB_ST_LIST) == false) - return false; - - for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); I++) - { - string URI = I->PackagesURI(); - string GetInfo = I->PackagesInfo(); - switch (I->Type) - { - case pkgSourceList::Item::Deb: - if (Engine.Get(URI + ".gz",List.SanitizeURI(URI),GetInfo) == false) - return false; - break; - }; - } - - return true; + Reset(); + return ReadAppend(File); } /*}}}*/ -// MakeSrcCache - Generate a cache file of all the package files /*{{{*/ +// SourceList::ReadAppend - Parse a sourcelist file /*{{{*/ // --------------------------------------------------------------------- -/* This goes over the source list and builds a cache of all the package - files. */ -bool pkgMakeSrcCache(pkgSourceList &List) +/* */ +bool pkgSourceList::ReadAppend(string File) { - // First we date check the cache - bool Bad = false; - while (Bad == false) + // 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) { - if (FileExists(PKG_DEB_CA_SRCCACHE) == false) - break; - - pkgCache Cache(PKG_DEB_CA_SRCCACHE,true,true); - if (_error->PendingError() == true) - { - _error->Discard(); - break; - } + 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; + // 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; - // They are certianly out of sync - if (Cache.Head().PackageFileCount != List.size()) - break; + const char *C = _strstrip(Buffer); - for (pkgCache::PkgFileIterator F(Cache); F.end() == false; F++) + // 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()); + + // Vendor name specified + if (C[0] == '[') { - // Search for a match in the source list - Bad = true; - for (pkgSourceList::const_iterator I = List.begin(); - I != List.end(); I++) - { - string File = string(PKG_DEB_ST_LIST) + - List.SanitizeURI(I->PackagesURI()); - if (F.FileName() == File) - { - Bad = false; - break; - } - } + string VendorID; - // Check if the file matches what was cached - Bad |= !F.IsOk(); - if (Bad == true) - break; - } + if (ParseQuoteWord(C,VendorID) == false) + return _error->Error(_("Malformed line %u in source list %s (vendor id)"),CurLine,File.c_str()); - if (Bad == false) - return true; - } - - unlink(PKG_DEB_CA_SRCCACHE); - pkgCache::MergeState Merge(PKG_DEB_CA_SRCCACHE); - if (_error->PendingError() == true) - return false; - - for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); I++) - { - string File = string(PKG_DEB_ST_LIST) + List.SanitizeURI(I->PackagesURI()); - if (Merge.MergePackageFile(File,"??","??") == false) + 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_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) return false; } - return true; } /*}}}*/ -// MakeStatusCache - Generates a cache that includes the status files /*{{{*/ +// SourceList::FindIndex - Get the index associated with a file /*{{{*/ // --------------------------------------------------------------------- -/* This copies the package source cache and then merges the status and - xstatus files into it. */ -bool pkgMakeStatusCache() +/* */ +bool pkgSourceList::FindIndex(pkgCache::PkgFileIterator File, + pkgIndexFile *&Found) const { - // Quickly check if the existing package cache is ok - bool Bad = false; - while (Bad == false) + for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++) { - if (FileExists(PKG_DEB_CA_PKGCACHE) == false) - break; - - /* We check the dates of the two caches. This takes care of most things - quickly and easially */ - struct stat Src; - struct stat Pkg; - if (stat(PKG_DEB_CA_PKGCACHE,&Pkg) != 0 || - stat(PKG_DEB_CA_SRCCACHE,&Src) != 0) - break; - if (difftime(Src.st_mtime,Pkg.st_mtime) > 0) - break; - - pkgCache Cache(PKG_DEB_CA_PKGCACHE,true,true); - if (_error->PendingError() == true) - { - _error->Discard(); - break; - } - - for (pkgCache::PkgFileIterator F(Cache); F.end() == false; F++) + vector *Indexes = (*I)->GetIndexFiles(); + for (vector::const_iterator J = Indexes->begin(); + J != Indexes->end(); J++) { - if (F.IsOk() == false) - { - Bad = true; - break; - } + if ((*J)->FindInCache(*File.Cache()) == File) + { + Found = (*J); + return true; + } } - - if (Bad == false) - return true; - } - - // Check the integrity of the source cache. - { - pkgCache Cache(PKG_DEB_CA_SRCCACHE,true,true); - if (_error->PendingError() == true) - return false; } - - // Sub scope so that merge destructs before we rename the file... - string Cache = PKG_DEB_CA_PKGCACHE ".new"; - { - if (CopyFile(PKG_DEB_CA_SRCCACHE,Cache) == false) - return false; - pkgCache::MergeState Merge(Cache); - if (_error->PendingError() == true) + return false; +} + /*}}}*/ +// 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; - - // Merge in the user status file - if (FileExists(PKG_DEB_ST_USERSTATUS) == true) - if (Merge.MergePackageFile(PKG_DEB_ST_USERSTATUS,"status","0", - pkgFLAG_NotSource) == false) - return false; - - // Merge in the extra status file - if (FileExists(PKG_DEB_ST_XSTATUS) == true) - if (Merge.MergePackageFile(PKG_DEB_ST_XSTATUS,"status","0", - pkgFLAG_NotSource) == false) - return false; - - // Merge in the status file - if (Merge.MergePackageFile("/var/lib/dpkg/status","status","0", - pkgFLAG_NotSource) == false) + return true; +} + /*}}}*/ +// CNC:2003-03-03 - By Anton V. Denisov . +// SourceList::ReadSourceDir - Read a directory with sources files +// Based on ReadConfigDir() /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgSourceList::ReadSourceDir(string Dir) +{ + vector const List = GetListOfFilesInDir(Dir, "list", true); + + // Read the files + for (vector::const_iterator I = List.begin(); I != List.end(); I++) + if (ReadAppend(*I) == false) return false; - } - - if (rename(Cache.c_str(),PKG_DEB_CA_PKGCACHE) != 0) - return false; - return true; + } /*}}}*/ +