X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/9c14e3d619e713aefa623986b5bbae81a1d6cc94..f58a97d3de5b43fd2cf8c0928939241b7b01c67d:/apt-pkg/sourcelist.cc diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index bce3e5990..1fdbd834e 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.2 1998/07/09 05:12:28 jgg Exp $ +// $Id: sourcelist.cc,v 1.17 1999/10/17 07:30:23 jgg Exp $ /* ###################################################################### List of Sources @@ -9,14 +9,14 @@ /*}}}*/ // Include Files /*{{{*/ #ifdef __GNUG__ -#pragma implementation "pkglib/sourcelist.h" +#pragma implementation "apt-pkg/sourcelist.h" #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -41,7 +41,7 @@ pkgSourceList::pkgSourceList(string File) /* */ bool pkgSourceList::ReadMainList() { - return Read(_config->Find("APT::Etc:sourcelist")); + return Read(_config->FindFile("Dir::Etc::sourcelist")); } /*}}}*/ // SourceList::Read - Parse the sourcelist file /*{{{*/ @@ -73,7 +73,7 @@ bool pkgSourceList::Read(string File) string Type; string URI; Item Itm; - char *C = Buffer; + const 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) @@ -108,52 +108,13 @@ bool pkgSourceList::Read(string File) 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; + O << (int)Itm.Type << ' ' << Itm.URI << ' ' << Itm.Dist << ' ' << Itm.Section; return O; } /*}}}*/ @@ -168,7 +129,13 @@ bool pkgSourceList::Item::SetType(string S) return true; } - return true; + if (S == "deb-src") + { + Type = DebSrc; + return true; + } + + return false; } /*}}}*/ // SourceList::Item::SetURI - Set the URI /*{{{*/ @@ -202,13 +169,28 @@ string pkgSourceList::Item::PackagesURI() const { case Deb: if (Dist[Dist.size() - 1] == '/') - Res = URI + Dist; + { + if (Dist != "/") + Res = URI + Dist; + else + Res = URI; + } 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; } @@ -224,12 +206,86 @@ string pkgSourceList::Item::PackagesInfo() const case Deb: Res += SiteOnly(URI) + ' '; if (Dist[Dist.size() - 1] == '/') - Res += Dist; + { + if (Dist != "/") + 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; +} + /*}}}*/ +// SourceList::Item::ReleaseURI - Returns a URI to the release file /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string pkgSourceList::Item::ReleaseURI() const +{ + string Res; + switch (Type) + { + case Deb: + if (Dist[Dist.size() - 1] == '/') + { + if (Dist != "/") + Res = URI + Dist; + else + Res = URI; + } + else + Res = URI + "dists/" + Dist + '/' + Section + + "/binary-" + _config->Find("APT::Architecture") + '/'; + + Res += "Release"; + break; + + case DebSrc: + if (Dist[Dist.size() - 1] == '/') + Res = URI + Dist; + else + Res = URI + "dists/" + Dist + '/' + Section + + "/source/"; + + 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] == '/') + { + if (Dist != "/") + Res += Dist; + } + else + Res += Dist + '/' + Section; + + Res += " Release"; + break; }; return Res; } @@ -242,15 +298,22 @@ string pkgSourceList::Item::ArchiveInfo(pkgCache::VerIterator Ver) const string Res; switch (Type) { + case DebSrc: case Deb: Res += SiteOnly(URI) + ' '; if (Dist[Dist.size() - 1] == '/') - Res += Dist; + { + if (Dist != "/") + Res += Dist; + } else Res += Dist + '/' + Section; Res += " "; Res += Ver.ParentPkg().Name(); + Res += " "; + Res += Ver.VerStr(); + break; }; return Res; @@ -265,26 +328,53 @@ string pkgSourceList::Item::ArchiveURI(string File) const switch (Type) { case Deb: + case DebSrc: Res = URI + File; break; }; return Res; } /*}}}*/ +// SourceList::Item::SourceInfo - Returns an info line for a source /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string pkgSourceList::Item::SourceInfo(string Pkg,string Ver,string Comp) const +{ + string Res; + switch (Type) + { + case DebSrc: + case Deb: + Res += SiteOnly(URI) + ' '; + if (Dist[Dist.size() - 1] == '/') + { + if (Dist != "/") + Res += Dist; + } + else + Res += Dist + '/' + Section; + + Res += " "; + Res += Pkg; + Res += " "; + Res += Ver; + if (Comp.empty() == false) + Res += " (" + Comp + ")"; + 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); + ::URI U(URI); + U.User = string(); + U.Password = string(); + U.Path = string(); + U.Port = 0; + return U; } /*}}}*/