X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/6c139d6e362f04a1582e8a8f511f8aeab031fecf..e5a1f2ff4cd1300364c7c644958583a8af704173:/apt-pkg/deb/deblistparser.cc diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 5fbb43a9f..157a465f4 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: deblistparser.cc,v 1.4 1998/07/07 04:17:16 jgg Exp $ +// $Id: deblistparser.cc,v 1.17 1999/02/21 08:38:53 jgg Exp $ /* ###################################################################### Package Cache Generator - Generator for the cache structure. @@ -10,52 +10,19 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#include -#include +#include +#include +#include +#include + #include /*}}}*/ // ListParser::debListParser - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -debListParser::debListParser(File &File) : Tags(File) -{ -} - /*}}}*/ -// ListParser::FindTag - Find the tag and return a string /*{{{*/ -// --------------------------------------------------------------------- -/* */ -string debListParser::FindTag(const char *Tag) -{ - const char *Start; - const char *Stop; - if (Section.Find(Tag,Start,Stop) == false) - return string(); - return string(Start,Stop - Start); -} - /*}}}*/ -// ListParser::FindTagI - Find the tag and return an int /*{{{*/ -// --------------------------------------------------------------------- -/* */ -signed long debListParser::FindTagI(const char *Tag,signed long Default) +debListParser::debListParser(FileFd &File) : Tags(File) { - const char *Start; - const char *Stop; - if (Section.Find(Tag,Start,Stop) == false) - return Default; - - // Copy it into a temp buffer so we can use strtol - char S[300]; - if ((unsigned)(Stop - Start) >= sizeof(S)) - return Default; - strncpy(S,Start,Stop-Start); - S[Stop - Start] = 0; - - char *End; - signed long Result = strtol(S,&End,10); - if (S == End) - return Default; - return Result; } /*}}}*/ // ListParser::UniqFindTagWrite - Find the tag and write a unq string /*{{{*/ @@ -70,47 +37,14 @@ unsigned long debListParser::UniqFindTagWrite(const char *Tag) return WriteUniqString(Start,Stop - Start); } /*}}}*/ -// ListParser::HandleFlag - Sets a flag variable based on a tag /*{{{*/ -// --------------------------------------------------------------------- -/* This checks the tag for true/false yes/no etc */ -bool debListParser::HandleFlag(const char *Tag,unsigned long &Flags, - unsigned long Flag) -{ - const char *Start; - const char *Stop; - if (Section.Find(Tag,Start,Stop) == false) - return true; - - int Set = 2; - if (strncasecmp(Start,"yes",Stop - Start) == 0) - Set = 1; - if (strncasecmp(Start,"true",Stop - Start) == 0) - Set = 1; - if (strncasecmp(Start,"no",Stop - Start) == 0) - Set = 0; - if (strncasecmp(Start,"false",Stop - Start) == 0) - Set = 0; - if (Set == 2) - { - _error->Warning("Unknown flag value"); - return true; - } - - if (Set == 0) - Flags &= ~Flag; - if (Set == 1) - Flags |= Flag; - return true; -} - /*}}}*/ // ListParser::Package - Return the package name /*{{{*/ // --------------------------------------------------------------------- /* This is to return the name of the package this section describes */ string debListParser::Package() { - string Result = FindTag("Package"); + string Result = Section.FindS("Package"); if (Result.empty() == true) - _error->Error("Encoutered a section with no Package: header"); + _error->Error("Encountered a section with no Package: header"); return Result; } /*}}}*/ @@ -121,7 +55,7 @@ string debListParser::Package() entry is assumed to only describe package properties */ string debListParser::Version() { - return FindTag("Version"); + return Section.FindS("Version"); } /*}}}*/ // ListParser::NewVersion - Fill in the version structure /*{{{*/ @@ -130,16 +64,14 @@ string debListParser::Version() bool debListParser::NewVersion(pkgCache::VerIterator Ver) { // Parse the section - if ((Ver->Section = UniqFindTagWrite("Section")) == 0) - return _error->Warning("Missing Section tag"); + Ver->Section = UniqFindTagWrite("Section"); + Ver->Arch = UniqFindTagWrite("Architecture"); // Archive Size - if ((Ver->Size = (unsigned)FindTagI("Size")) == 0) - return _error->Error("Unparsable Size field"); + Ver->Size = (unsigned)Section.FindI("Size"); // Unpacked Size (in K) - if ((Ver->InstalledSize = (unsigned)FindTagI("Installed-Size")) == 0) - return _error->Error("Unparsable Installed-Size field"); + Ver->InstalledSize = (unsigned)Section.FindI("Installed-Size"); Ver->InstalledSize *= 1024; // Priority @@ -159,7 +91,7 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) if (ParseDepends(Ver,"Depends",pkgCache::Dep::Depends) == false) return false; - if (ParseDepends(Ver,"PreDepends",pkgCache::Dep::PreDepends) == false) + if (ParseDepends(Ver,"Pre-Depends",pkgCache::Dep::PreDepends) == false) return false; if (ParseDepends(Ver,"Suggests",pkgCache::Dep::Suggests) == false) return false; @@ -167,7 +99,7 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) return false; if (ParseDepends(Ver,"Conflicts",pkgCache::Dep::Conflicts) == false) return false; - if (ParseDepends(Ver,"Replaces",pkgCache::Dep::Depends) == false) + if (ParseDepends(Ver,"Replaces",pkgCache::Dep::Replaces) == false) return false; if (ParseProvides(Ver) == false) @@ -184,12 +116,15 @@ bool debListParser::UsePackage(pkgCache::PkgIterator Pkg, pkgCache::VerIterator Ver) { if (Pkg->Section == 0) - if ((Pkg->Section = UniqFindTagWrite("Section")) == 0) - return false; - if (HandleFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false) + Pkg->Section = UniqFindTagWrite("Section"); + if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false) return false; - if (HandleFlag("Immediate-Configure",Pkg->Flags,pkgCache::Flag::ImmediateConf) == false) + if (Section.FindFlag("Important",Pkg->Flags,pkgCache::Flag::Important) == false) return false; + + if (strcmp(Pkg.Name(),"apt") == 0) + Pkg->Flags |= pkgCache::Flag::Important; + if (ParseStatus(Pkg,Ver) == false) return false; return true; @@ -423,13 +358,16 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, string Version; unsigned int Op; - while ((Start = ParseDepends(Start,Stop,Package,Version,Op)) != Stop) + while (1) { + Start = ParseDepends(Start,Stop,Package,Version,Op); if (Start == 0) return _error->Error("Problem parsing dependency %s",Tag); - + if (NewDepends(Ver,Package,Version,Op,Type) == false) return false; + if (Start == Stop) + break; } return true; } @@ -489,6 +427,7 @@ bool debListParser::GrabWord(string Word,WordList *List,int Count, bool debListParser::Step() { iOffset = Tags.Offset(); + string Arch = _config->Find("APT::architecture"); while (Tags.Step(Section) == true) { /* See if this is the correct Architecture, if it isnt then we @@ -497,13 +436,11 @@ bool debListParser::Step() const char *Stop; if (Section.Find("Architecture",Start,Stop) == false) return true; - - if (strncmp(Start,"i386",Stop - Start) == 0 && - strlen("i386") == (unsigned)(Stop - Start)) + + if (stringcmp(Start,Stop,Arch.begin(),Arch.end()) == 0) return true; - if (strncmp(Start,"all",Stop - Start) == 0 && - 3 == (unsigned)(Stop - Start)) + if (stringcmp(Start,Stop,"all") == 0) return true; iOffset = Tags.Offset(); @@ -511,3 +448,36 @@ bool debListParser::Step() return false; } /*}}}*/ +// ListParser::LoadReleaseInfo - Load the release information /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, + FileFd &File) +{ + pkgTagFile Tags(File); + pkgTagSection Section; + if (Tags.Step(Section) == false) + return false; + + const char *Start; + const char *Stop; + if (Section.Find("Archive",Start,Stop) == true) + FileI->Archive = WriteUniqString(Start,Stop - Start); + if (Section.Find("Component",Start,Stop) == true) + FileI->Component = WriteUniqString(Start,Stop - Start); + if (Section.Find("Version",Start,Stop) == true) + FileI->Version = WriteUniqString(Start,Stop - Start); + if (Section.Find("Origin",Start,Stop) == true) + FileI->Origin = WriteUniqString(Start,Stop - Start); + if (Section.Find("Label",Start,Stop) == true) + FileI->Label = WriteUniqString(Start,Stop - Start); + if (Section.Find("Architecture",Start,Stop) == true) + FileI->Architecture = WriteUniqString(Start,Stop - Start); + + if (Section.FindFlag("NotAutomatic",FileI->Flags, + pkgCache::Flag::NotAutomatic) == false) + _error->Warning("Bad NotAutomatic flag"); + + return !_error->PendingError(); +} + /*}}}*/