X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/f3f06cae53d8ed5742f47de46d9f9808cfc5ec29..631800b139834947b21c49153ba7862b1f4e6984:/cmdline/apt-cache.cc diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index a2c445401..24ed9eef3 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -43,6 +43,8 @@ #include #include +#include +#include #include #include @@ -64,38 +66,6 @@ using namespace std; -// LocalitySort - Sort a version list by package file locality /*{{{*/ -// --------------------------------------------------------------------- -/* */ -static int LocalityCompare(const void *a, const void *b) -{ - pkgCache::VerFile *A = *(pkgCache::VerFile **)a; - pkgCache::VerFile *B = *(pkgCache::VerFile **)b; - - if (A == 0 && B == 0) - return 0; - if (A == 0) - return 1; - if (B == 0) - return -1; - - if (A->File == B->File) - return A->Offset - B->Offset; - return A->File - B->File; -} - -static void LocalitySort(pkgCache::VerFile **begin, - unsigned long Count,size_t Size) -{ - qsort(begin,Count,Size,LocalityCompare); -} - -static void LocalitySort(pkgCache::DescFile **begin, - unsigned long Count,size_t Size) -{ - qsort(begin,Count,Size,LocalityCompare); -} - /*}}}*/ // UnMet - Show unmet dependencies /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -310,10 +280,16 @@ static void ShowHashTableStats(std::string Type, // Stats - Dump some nice statistics /*{{{*/ // --------------------------------------------------------------------- /* */ -static bool Stats(CommandLine &) +static bool Stats(CommandLine &CmdL) { + if (CmdL.FileSize() > 1) { + _error->Error(_("apt-cache stats does not take any arguments")); + return false; + } + pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) return false; @@ -719,7 +695,6 @@ static bool ShowDepends(CommandLine &CmdL, bool const RevDepends) continue; pkgCache::PkgIterator Trg = RevDepends ? D.ParentPkg() : D.TargetPkg(); - bool const showNoArch = RevDepends || (D->CompareOp & pkgCache::Dep::ArchSpecific) != pkgCache::Dep::ArchSpecific; if((Installed && Trg->CurrentVer != 0) || !Installed) { @@ -733,9 +708,9 @@ static bool ShowDepends(CommandLine &CmdL, bool const RevDepends) if (ShowDepType == true) cout << D.DepType() << ": "; if (Trg->VersionList == 0) - cout << "<" << Trg.FullName(showNoArch) << ">"; + cout << "<" << Trg.FullName(true) << ">"; else - cout << Trg.FullName(showNoArch); + cout << Trg.FullName(true); if (ShowVersion == true && D->Version != 0) cout << " (" << pkgCache::CompTypeDeb(D->CompareOp) << ' ' << D.TargetVer() << ')'; cout << std::endl; @@ -749,9 +724,9 @@ static bool ShowDepends(CommandLine &CmdL, bool const RevDepends) } // Display all solutions - SPtrArray List = D.AllTargets(); - pkgPrioSortList(*Cache,List); - for (pkgCache::Version **I = List; *I != 0; I++) + std::unique_ptr List(D.AllTargets()); + pkgPrioSortList(*Cache,List.get()); + for (pkgCache::Version **I = List.get(); *I != 0; I++) { pkgCache::VerIterator V(*Cache,*I); if (V != Cache->VerP + V.ParentPkg()->VersionList || @@ -1209,291 +1184,6 @@ static bool Dotty(CommandLine &CmdL) return true; } /*}}}*/ -// DisplayRecord - Displays the complete record for the package /*{{{*/ -// --------------------------------------------------------------------- -/* This displays the package record from the proper package index file. - It is not used by DumpAvail for performance reasons. */ - -static APT_PURE unsigned char const* skipDescriptionFields(unsigned char const * DescP) -{ - char const * const TagName = "\nDescription"; - size_t const TagLen = strlen(TagName); - while ((DescP = (unsigned char*)strchr((char*)DescP, '\n')) != NULL) - { - if (DescP[1] == ' ') - DescP += 2; - else if (strncmp((char*)DescP, TagName, TagLen) == 0) - DescP += TagLen; - else - break; - } - if (DescP != NULL) - ++DescP; - return DescP; -} -static bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) -{ - pkgCache *Cache = CacheFile.GetPkgCache(); - if (unlikely(Cache == NULL)) - return false; - - // Find an appropriate file - pkgCache::VerFileIterator Vf = V.FileList(); - for (; Vf.end() == false; ++Vf) - if ((Vf.File()->Flags & pkgCache::Flag::NotSource) == 0) - break; - if (Vf.end() == true) - Vf = V.FileList(); - - // Check and load the package list file - pkgCache::PkgFileIterator I = Vf.File(); - if (I.IsOk() == false) - return _error->Error(_("Package file %s is out of sync."),I.FileName()); - - FileFd PkgF; - if (PkgF.Open(I.FileName(), FileFd::ReadOnly, FileFd::Extension) == false) - return false; - - // Read the record (and ensure that it ends with a newline and NUL) - unsigned char *Buffer = new unsigned char[Cache->HeaderP->MaxVerFileSize+2]; - Buffer[Vf->Size] = '\n'; - Buffer[Vf->Size+1] = '\0'; - if (PkgF.Seek(Vf->Offset) == false || - PkgF.Read(Buffer,Vf->Size) == false) - { - delete [] Buffer; - return false; - } - - // Get a pointer to start of Description field - const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "\nDescription"); - if (DescP != NULL) - ++DescP; - else - DescP = Buffer + Vf->Size; - - // Write all but Description - size_t const length = DescP - Buffer; - if (length != 0 && FileFd::Write(STDOUT_FILENO, Buffer, length) == false) - { - delete [] Buffer; - return false; - } - - // Show the right description - pkgRecords Recs(*Cache); - pkgCache::DescIterator Desc = V.TranslatedDescription(); - if (Desc.end() == false) - { - pkgRecords::Parser &P = Recs.Lookup(Desc.FileList()); - cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc(); - cout << std::endl << "Description-md5: " << Desc.md5() << std::endl; - - // Find the first field after the description (if there is any) - DescP = skipDescriptionFields(DescP); - } - // else we have no translation, so we found a lonely Description-md5 -> don't skip it - - // write the rest of the buffer, but skip mixed in Descriptions* fields - while (DescP != NULL) - { - const unsigned char * const Start = DescP; - const unsigned char *End = (unsigned char*)strstr((char*)DescP, "\nDescription"); - if (End == NULL) - { - End = &Buffer[Vf->Size]; - DescP = NULL; - } - else - { - ++End; // get the newline into the output - DescP = skipDescriptionFields(End + strlen("Description")); - } - size_t const length = End - Start; - if (length != 0 && FileFd::Write(STDOUT_FILENO, Start, length) == false) - { - delete [] Buffer; - return false; - } - } - - // write a final newline after the last field - cout<FindB("APT::Cache::ShowFull",false); - bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly",false); - unsigned int const NumPatterns = CmdL.FileSize() -1; - - pkgCacheFile CacheFile; - pkgCache *Cache = CacheFile.GetPkgCache(); - pkgDepCache::Policy *Plcy = CacheFile.GetPolicy(); - if (unlikely(Cache == NULL || Plcy == NULL)) - return false; - - // Make sure there is at least one argument - if (NumPatterns < 1) - return _error->Error(_("You must give at least one search pattern")); - - // Compile the regex pattern - regex_t *Patterns = new regex_t[NumPatterns]; - memset(Patterns,0,sizeof(*Patterns)*NumPatterns); - for (unsigned I = 0; I != NumPatterns; I++) - { - if (regcomp(&Patterns[I],CmdL.FileList[I+1],REG_EXTENDED | REG_ICASE | - REG_NOSUB) != 0) - { - for (; I != 0; I--) - regfree(&Patterns[I]); - return _error->Error("Regex compilation error"); - } - } - - if (_error->PendingError() == true) - { - for (unsigned I = 0; I != NumPatterns; I++) - regfree(&Patterns[I]); - return false; - } - - size_t const descCount = Cache->HeaderP->GroupCount + 1; - ExDescFile *DFList = new ExDescFile[descCount]; - memset(DFList,0,sizeof(*DFList) * descCount); - - bool *PatternMatch = new bool[descCount * NumPatterns]; - memset(PatternMatch,false,sizeof(*PatternMatch) * descCount * NumPatterns); - - // Map versions that we want to write out onto the VerList array. - for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G) - { - size_t const PatternOffset = G->ID * NumPatterns; - size_t unmatched = 0, matched = 0; - for (unsigned I = 0; I < NumPatterns; ++I) - { - if (PatternMatch[PatternOffset + I] == true) - ++matched; - else if (regexec(&Patterns[I],G.Name(),0,0,0) == 0) - PatternMatch[PatternOffset + I] = true; - else - ++unmatched; - } - - // already dealt with this package? - if (matched == NumPatterns) - continue; - - // Doing names only, drop any that don't match.. - if (NamesOnly == true && unmatched == NumPatterns) - continue; - - // Find the proper version to use - pkgCache::PkgIterator P = G.FindPreferredPkg(); - if (P.end() == true) - continue; - pkgCache::VerIterator V = Plcy->GetCandidateVer(P); - if (V.end() == false) - { - pkgCache::DescIterator const D = V.TranslatedDescription(); - //FIXME: packages without a description can't be found - if (D.end() == true) - continue; - DFList[G->ID].Df = D.FileList(); - DFList[G->ID].ID = G->ID; - } - - if (unmatched == NumPatterns) - continue; - - // Include all the packages that provide matching names too - for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; ++Prv) - { - pkgCache::VerIterator V = Plcy->GetCandidateVer(Prv.OwnerPkg()); - if (V.end() == true) - continue; - - unsigned long id = Prv.OwnerPkg().Group()->ID; - pkgCache::DescIterator const D = V.TranslatedDescription(); - //FIXME: packages without a description can't be found - if (D.end() == true) - continue; - DFList[id].Df = D.FileList(); - DFList[id].ID = id; - - size_t const PrvPatternOffset = id * NumPatterns; - for (unsigned I = 0; I < NumPatterns; ++I) - PatternMatch[PrvPatternOffset + I] = PatternMatch[PatternOffset + I]; - } - } - - LocalitySort(&DFList->Df,Cache->HeaderP->GroupCount,sizeof(*DFList)); - - // Create the text record parser - pkgRecords Recs(*Cache); - // Iterate over all the version records and check them - for (ExDescFile *J = DFList; J->Df != 0; ++J) - { - pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(*Cache,J->Df)); - size_t const PatternOffset = J->ID * NumPatterns; - - if (NamesOnly == false) - { - string const LongDesc = P.LongDesc(); - for (unsigned I = 0; I < NumPatterns; ++I) - { - if (PatternMatch[PatternOffset + I] == true) - continue; - else if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0) - PatternMatch[PatternOffset + I] = true; - } - } - - bool matchedAll = true; - for (unsigned I = 0; I < NumPatterns; ++I) - if (PatternMatch[PatternOffset + I] == false) - { - matchedAll = false; - break; - } - - if (matchedAll == true) - { - if (ShowFull == true) - { - const char *Start; - const char *End; - P.GetRec(Start,End); - fwrite(Start,End-Start,1,stdout); - putc('\n',stdout); - } - else - printf("%s - %s\n",P.Name().c_str(),P.ShortDesc().c_str()); - } - } - - delete [] DFList; - delete [] PatternMatch; - for (unsigned I = 0; I != NumPatterns; I++) - regfree(&Patterns[I]); - delete [] Patterns; - if (ferror(stdout)) - return _error->Error("Write to stdout failed"); - return true; -} - /*}}}*/ /* ShowAuto - show automatically installed packages (sorted) {{{*/ static bool ShowAuto(CommandLine &) { @@ -1519,30 +1209,6 @@ static bool ShowAuto(CommandLine &) return true; } /*}}}*/ -// ShowPackage - Dump the package record to the screen /*{{{*/ -// --------------------------------------------------------------------- -/* */ -static bool ShowPackage(CommandLine &CmdL) -{ - pkgCacheFile CacheFile; - CacheSetHelperVirtuals helper(true, GlobalError::NOTICE); - APT::CacheSetHelper::VerSelector const select = _config->FindB("APT::Cache::AllVersions", true) ? - APT::CacheSetHelper::ALL : APT::CacheSetHelper::CANDIDATE; - APT::VersionList const verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper); - for (APT::VersionList::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) - if (DisplayRecord(CacheFile, Ver) == false) - return false; - - if (verset.empty() == true) - { - if (helper.virtualPkgs.empty() == true) - return _error->Error(_("No packages found")); - else - _error->Notice(_("No packages found")); - } - return true; -} - /*}}}*/ // ShowPkgNames - Show package names /*{{{*/ // --------------------------------------------------------------------- /* This does a prefix match on the first argument */ @@ -1605,6 +1271,10 @@ static bool ShowSrcPackage(CommandLine &CmdL) pkgSrcRecords::Parser *Parse; unsigned found_this = 0; while ((Parse = SrcRecs.Find(*I,false)) != 0) { + // SrcRecs.Find() will find both binary and source names + if (_config->FindB("APT::Cache::Only-Source", false) == true) + if (Parse->Package() != *I) + continue; cout << Parse->AsStr() << endl;; found++; found_this++; @@ -1908,7 +1578,7 @@ int main(int argc,const char *argv[]) /*{{{*/ {"dump",&Dump}, {"dumpavail",&DumpAvail}, {"unmet",&UnMet}, - {"search",&Search}, + {"search",&DoSearch}, {"depends",&Depends}, {"rdepends",&RDepends}, {"dotty",&Dotty},