support regular expressions in 'apt search'

[apt.git] / apt-private / private-list.cc

diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index fbb66d20425e9e4b8f21b395e7e5ff0e41be8f2c..b69002103e3d44d8e3a6b33315fb6a48dc3f3874 100644 (file)
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -1,43 +1,28 @@
 // Include Files                                                       /*{{{*/
 #include <config.h>
 
 // Include Files                                                       /*{{{*/
 #include <config.h>
 

-#include <apt-pkg/error.h>

 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/cacheset.h>

-#include <apt-pkg/init.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/sourcelist.h>

 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/cmndline.h>

-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>

 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/pkgrecords.h>

-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/sptr.h>
-#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/metaindex.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>

 
 

+#include <apt-private/private-cacheset.h>
+#include <apt-private/private-list.h>
+#include <apt-private/private-output.h>
+
+#include <iostream>

 #include <sstream>
 #include <sstream>

-#include <vector>
+#include <map>
+#include <string>

 #include <utility>
 #include <utility>

-#include <cassert>
-#include <locale.h>
-#include <iostream>
-#include <unistd.h>
-#include <errno.h>
-#include <regex.h>
-#include <stdio.h>
-#include <algorithm>
-
-#include "private-cmndline.h"
-#include "private-list.h"
-#include "private-output.h"
-#include "private-cacheset.h"
+#include <vector>

 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/


@@ -61,7 +46,7 @@ class PackageNameMatcher : public Matcher                             /*{{{*/
   public:
    PackageNameMatcher(const char **patterns)
    {
   public:
    PackageNameMatcher(const char **patterns)
    {

-      for(int i=0; patterns[i] != NULL; i++)
+      for(int i=0; patterns[i] != NULL; ++i)

       {
          std::string pattern = patterns[i];
 #ifdef PACKAGE_MATCHER_ABI_COMPAT
       {
          std::string pattern = patterns[i];
 #ifdef PACKAGE_MATCHER_ABI_COMPAT


@@ -79,12 +64,12 @@ class PackageNameMatcher : public Matcher                           /*{{{*/
    }
    virtual ~PackageNameMatcher()
    {
    }
    virtual ~PackageNameMatcher()
    {

-      for(J=filters.begin(); J != filters.end(); J++)
+      for(J=filters.begin(); J != filters.end(); ++J)

          delete *J;
    }
    virtual bool operator () (const pkgCache::PkgIterator &P) 
    {
          delete *J;
    }
    virtual bool operator () (const pkgCache::PkgIterator &P) 
    {

-      for(J=filters.begin(); J != filters.end(); J++)
+      for(J=filters.begin(); J != filters.end(); ++J)

       {
          APT::CacheFilter::PackageMatcher *cachefilter = *J;
          if((*cachefilter)(P)) 
       {
          APT::CacheFilter::PackageMatcher *cachefilter = *J;
          if((*cachefilter)(P)) 


@@ -99,13 +84,13 @@ private:
    #undef PackageMatcher
 };
                                                                        /*}}}*/
    #undef PackageMatcher
 };
                                                                        /*}}}*/

-void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,     /*{{{*/
+static void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,/*{{{*/

                      pkgCache::PkgIterator P,    
                      std::ostream &outs,
                      bool include_summary=true)
 {
    for (pkgCache::VerIterator Ver = P.VersionList();
                      pkgCache::PkgIterator P,    
                      std::ostream &outs,
                      bool include_summary=true)
 {
    for (pkgCache::VerIterator Ver = P.VersionList();

-        Ver.end() == false; Ver++) 
+        Ver.end() == false; ++Ver)

    {
       ListSingleVersion(CacheFile, records, Ver, outs, include_summary);
       outs << "\n";
    {
       ListSingleVersion(CacheFile, records, Ver, outs, include_summary);
       outs << "\n";


@@ -114,14 +99,13 @@ void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records, /*{{{*/
                                                                        /*}}}*/
 // list - list package based on criteria                               /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // list - list package based on criteria                               /*{{{*/
 // ---------------------------------------------------------------------

-bool List(CommandLine &Cmd)
+bool DoList(CommandLine &Cmd)

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();

-   pkgRecords records(CacheFile);
-

    if (unlikely(Cache == NULL))
       return false;
    if (unlikely(Cache == NULL))
       return false;

+   pkgRecords records(CacheFile);

 
    const char **patterns;
    const char *all_pattern[] = { "*", NULL};
 
    const char **patterns;
    const char *all_pattern[] = { "*", NULL};


@@ -146,10 +130,11 @@ bool List(CommandLine &Cmd)
                             Cache->Head().PackageCount,
                             _("Listing"));
    GetLocalitySortedVersionSet(CacheFile, bag, matcher, progress);
                             Cache->Head().PackageCount,
                             _("Listing"));
    GetLocalitySortedVersionSet(CacheFile, bag, matcher, progress);

-   for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); V++)
+   bool ShowAllVersions = _config->FindB("APT::Cmd::All-Versions", false);
+   for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); ++V)

    {
       std::stringstream outs;
    {
       std::stringstream outs;

-      if(_config->FindB("APT::Cmd::All-Versions", false) == true)
+      if(ShowAllVersions == true)

       {
          ListAllVersions(CacheFile, records, V.ParentPkg(), outs, includeSummary);
          output_map.insert(std::make_pair<std::string, std::string>(
       {
          ListAllVersions(CacheFile, records, V.ParentPkg(), outs, includeSummary);
          output_map.insert(std::make_pair<std::string, std::string>(


@@ -163,10 +148,22 @@ bool List(CommandLine &Cmd)
 
    // FIXME: SORT! and make sorting flexible (alphabetic, by pkg status)
    // output the sorted map
 
    // FIXME: SORT! and make sorting flexible (alphabetic, by pkg status)
    // output the sorted map

-   for (K = output_map.begin(); K != output_map.end(); K++)
+   for (K = output_map.begin(); K != output_map.end(); ++K)

       std::cout << (*K).second << std::endl;
 
 
       std::cout << (*K).second << std::endl;
 
 

+   // be nice and tell the user if there is more to see
+   if (bag.size() == 1 && ShowAllVersions == false)
+   {
+      // start with -1 as we already displayed one version
+      int versions = -1;
+      pkgCache::VerIterator Ver = *bag.begin();
+      for ( ; Ver.end() == false; Ver++)
+         versions++;
+      if (versions > 0)
+         _error->Notice(P_("There is %i additional version. Please use the '-a' switch to see it", "There are %i additional versions. Please use the '-a' switch to see them.", versions), versions);
+   }
+

    return true;
 }
 
    return true;
 }