fix off-by-one error and do not use magic constant of 100 when checking StackPost

[apt.git] / cmdline / apt-cache.cc

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 94654ffd4c8864cd5227aa064f7bfa660fe17193..fb4467c2cd802688f34bcd74ef218584c85dd581 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -597,6 +597,7 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
    bool const Installed = _config->FindB("APT::Cache::Installed", false);
    bool const Important = _config->FindB("APT::Cache::Important", false);
    bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType", RevDepends == false);
    bool const Installed = _config->FindB("APT::Cache::Installed", false);
    bool const Important = _config->FindB("APT::Cache::Important", false);
    bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType", RevDepends == false);

+   bool const ShowVersion = _config->FindB("APT::Cache::ShowVersion", false);

    bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true);
    bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true);
    bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false);
    bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true);
    bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true);
    bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false);


@@ -646,10 +647,13 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
                if (ShowDepType == true)
                  cout << D.DepType() << ": ";
                if (Trg->VersionList == 0)
                if (ShowDepType == true)
                  cout << D.DepType() << ": ";
                if (Trg->VersionList == 0)

-                 cout << "<" << Trg.FullName(true) << ">" << endl;
+                 cout << "<" << Trg.FullName(true) << ">";

                else
                else

-                 cout << Trg.FullName(true) << endl;
-           
+                 cout << Trg.FullName(true);
+               if (ShowVersion == true && D->Version != 0)
+                  cout << " (" << pkgCache::CompTypeDeb(D->CompareOp) << ' ' << D.TargetVer() << ')';
+               cout << std::endl;
+

                if (Recurse == true && Shown[Trg->ID] == false)
                {
                  Shown[Trg->ID] = true;
                if (Recurse == true && Shown[Trg->ID] == false)
                {
                  Shown[Trg->ID] = true;


@@ -1157,7 +1161,11 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
    }
 
    // Get a pointer to start of Description field
    }
 
    // Get a pointer to start of Description field

-   const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "Description:");
+   const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "\nDescription");
+   if (DescP != NULL)
+      ++DescP;
+   else
+      DescP = Buffer + V.FileList()->Size;

 
    // Write all but Description
    if (fwrite(Buffer,1,DescP - Buffer,stdout) < (size_t)(DescP - Buffer))
 
    // Write all but Description
    if (fwrite(Buffer,1,DescP - Buffer,stdout) < (size_t)(DescP - Buffer))


@@ -1169,25 +1177,38 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
    // Show the right description
    pkgRecords Recs(*Cache);
    pkgCache::DescIterator Desc = V.TranslatedDescription();
    // Show the right description
    pkgRecords Recs(*Cache);
    pkgCache::DescIterator Desc = V.TranslatedDescription();

-   pkgRecords::Parser &P = Recs.Lookup(Desc.FileList());
-   cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc();
-
-   // Find the first field after the description (if there is any)
-   for(DescP++;DescP != &Buffer[V.FileList()->Size];DescP++) 
+   if (Desc.end() == false)

    {
    {

-      if(*DescP == '\n' && *(DescP+1) != ' ') 
+      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)
+      while ((DescP = (unsigned char*)strchr((char*)DescP, '\n')) != NULL)

       {
       {

-        // write the rest of the buffer
-        const unsigned char *end=&Buffer[V.FileList()->Size];
-        if (fwrite(DescP,1,end-DescP,stdout) < (size_t)(end-DescP)) 
-        {
-           delete [] Buffer;
-           return false;
-        }
+        if (DescP[1] == ' ')
+           DescP += 2;
+        else if (strncmp((char*)DescP, "\nDescription", strlen("\nDescription")) == 0)
+           DescP += strlen("\nDescription");
+        else
+           break;
+      }
+      if (DescP != NULL)
+        ++DescP;
+   }
+   // if we have no translation, we found a lonely Description-md5, so don't skip it

 
 

-        break;
+   if (DescP != NULL)
+   {
+      // write the rest of the buffer
+      const unsigned char *end=&Buffer[V.FileList()->Size];
+      if (fwrite(DescP,1,end-DescP,stdout) < (size_t)(end-DescP))
+      {
+        delete [] Buffer;
+        return false;

       }
    }
       }
    }

+

    // write a final newline (after the description)
    cout<<endl;
    delete [] Buffer;
    // write a final newline (after the description)
    cout<<endl;
    delete [] Buffer;


@@ -1199,7 +1220,7 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
 struct ExDescFile
 {
    pkgCache::DescFile *Df;
 struct ExDescFile
 {
    pkgCache::DescFile *Df;

-   bool NameMatch;
+   map_ptrloc ID;

 };
 
 // Search - Perform a search                                           /*{{{*/
 };
 
 // Search - Perform a search                                           /*{{{*/


@@ -1242,37 +1263,48 @@ bool Search(CommandLine &CmdL)
       return false;
    }
    
       return false;
    }
    

-   ExDescFile *DFList = new ExDescFile[Cache->HeaderP->GroupCount+1];
-   memset(DFList,0,sizeof(*DFList)*Cache->HeaderP->GroupCount+1);
+   size_t const descCount = Cache->HeaderP->GroupCount + 1;
+   ExDescFile *DFList = new ExDescFile[descCount];
+   memset(DFList,0,sizeof(*DFList) * descCount);
+
+   bool PatternMatch[descCount * NumPatterns];
+   memset(PatternMatch,false,sizeof(PatternMatch));

 
    // Map versions that we want to write out onto the VerList array.
    for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G)
    {
 
    // Map versions that we want to write out onto the VerList array.
    for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G)
    {

-      if (DFList[G->ID].NameMatch == true)
-        continue;
-
-      DFList[G->ID].NameMatch = true;
-      for (unsigned I = 0; I != NumPatterns; I++)
+      size_t const PatternOffset = G->ID * NumPatterns;
+      size_t unmatched = 0, matched = 0;
+      for (unsigned I = 0; I < NumPatterns; ++I)

       {
       {

-        if (regexec(&Patterns[I],G.Name(),0,0,0) == 0)
-           continue;
-        DFList[G->ID].NameMatch = false;
-        break;
+        if (PatternMatch[PatternOffset + I] == true)
+           ++matched;
+        else if (regexec(&Patterns[I],G.Name(),0,0,0) == 0)
+           PatternMatch[PatternOffset + I] = true;
+        else
+           ++unmatched;

       }
       }

-        
-      // Doing names only, drop any that dont match..
-      if (NamesOnly == true && DFList[G->ID].NameMatch == false)
+
+      // already dealt with this package?
+      if (matched == NumPatterns)

         continue;
         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)
       // 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)

+      {

         DFList[G->ID].Df = V.TranslatedDescription().FileList();
         DFList[G->ID].Df = V.TranslatedDescription().FileList();

+        DFList[G->ID].ID = G->ID;
+      }

 
 

-      if (DFList[G->ID].NameMatch == false)
+      if (unmatched == NumPatterns)

         continue;
 
       // Include all the packages that provide matching names too
         continue;
 
       // Include all the packages that provide matching names too


@@ -1284,33 +1316,45 @@ bool Search(CommandLine &CmdL)
 
         unsigned long id = Prv.OwnerPkg().Group()->ID;
         DFList[id].Df = V.TranslatedDescription().FileList();
 
         unsigned long id = Prv.OwnerPkg().Group()->ID;
         DFList[id].Df = V.TranslatedDescription().FileList();

-        DFList[id].NameMatch = true;
+        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
    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++)
+   for (ExDescFile *J = DFList; J->Df != 0; ++J)

    {
       pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(*Cache,J->Df));
    {
       pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(*Cache,J->Df));

+      size_t const PatternOffset = J->ID * NumPatterns;

 
 

-      if (J->NameMatch == false && NamesOnly == false)
+      if (NamesOnly == false)

       {
         string const LongDesc = P.LongDesc();
       {
         string const LongDesc = P.LongDesc();

-        J->NameMatch = true;
-        for (unsigned I = 0; I != NumPatterns; I++)
+        for (unsigned I = 0; I < NumPatterns; ++I)

         {
         {

-           if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0)
+           if (PatternMatch[PatternOffset + I] == true)

               continue;
               continue;

-           J->NameMatch = false;
-           break;
+           else if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0)
+              PatternMatch[PatternOffset + I] = true;

         }
       }
         }
       }

-      
-      if (J->NameMatch == 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)
         {
       {
         if (ShowFull == true)
         {


@@ -1676,7 +1720,7 @@ bool GenCaches(CommandLine &Cmd)
 /* */
 bool ShowHelp(CommandLine &Cmd)
 {
 /* */
 bool ShowHelp(CommandLine &Cmd)
 {

-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,

            COMMON_ARCH,__DATE__,__TIME__);
    
    if (_config->FindB("version") == true)
            COMMON_ARCH,__DATE__,__TIME__);
    
    if (_config->FindB("version") == true)