merge with my debian-sid branch

[apt.git] / apt-pkg / contrib / configuration.h

diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 2534692a371164c09eb15782a055573f3e1a3057..f6f2a3c1d7e5a46c19b90b23e1c141c40903874e 100644 (file)
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -28,26 +28,25 @@
 #ifndef PKGLIB_CONFIGURATION_H
 #define PKGLIB_CONFIGURATION_H
 
 #ifndef PKGLIB_CONFIGURATION_H
 #define PKGLIB_CONFIGURATION_H
 

-
+#include <regex.h>

 
 #include <string>
 
 #include <string>

+#include <vector>

 #include <iostream>
 
 #include <iostream>
 

-using std::string;
-

 class Configuration
 {
    public:
    
    struct Item
    {
 class Configuration
 {
    public:
    
    struct Item
    {

-      string Value;
-      string Tag;
+      std::string Value;
+      std::string Tag;

       Item *Parent;
       Item *Child;
       Item *Next;
       
       Item *Parent;
       Item *Child;
       Item *Next;
       

-      string FullTag(const Item *Stop = 0) const;
+      std::string FullTag(const Item *Stop = 0) const;

       
       Item() : Parent(0), Child(0), Next(0) {};
    };
       
       Item() : Parent(0), Child(0), Next(0) {};
    };


@@ -57,8 +56,8 @@ class Configuration
    Item *Root;
    bool ToFree;
    
    Item *Root;
    bool ToFree;
    

-   Item *Lookup(Item *Head,const char *S,unsigned long Len,bool Create);
-   Item *Lookup(const char *Name,bool Create);   
+   Item *Lookup(Item *Head,const char *S,unsigned long const &Len,bool const &Create);
+   Item *Lookup(const char *Name,const bool &Create);

    inline const Item *Lookup(const char *Name) const
    {
       return ((Configuration *)this)->Lookup(Name,false);
    inline const Item *Lookup(const char *Name) const
    {
       return ((Configuration *)this)->Lookup(Name,false);


@@ -66,31 +65,35 @@ class Configuration
    
    public:
 
    
    public:
 

-   string Find(const char *Name,const char *Default = 0) const;
-   string Find(const string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);};
-   string FindFile(const char *Name,const char *Default = 0) const;
-   string FindDir(const char *Name,const char *Default = 0) const;
-   int FindI(const char *Name,int Default = 0) const;
-   int FindI(const string Name,int Default = 0) const {return FindI(Name.c_str(),Default);};
-   bool FindB(const char *Name,bool Default = false) const;
-   bool FindB(const string Name,bool Default = false) const {return FindB(Name.c_str(),Default);};
-   string FindAny(const char *Name,const char *Default = 0) const;
+   std::string Find(const char *Name,const char *Default = 0) const;
+   std::string Find(std::string const &Name,const char *Default = 0) const {return Find(Name.c_str(),Default);};
+   std::string Find(std::string const &Name, std::string const &Default) const {return Find(Name.c_str(),Default.c_str());};
+   std::string FindFile(const char *Name,const char *Default = 0) const;
+   std::string FindDir(const char *Name,const char *Default = 0) const;
+   std::vector<std::string> FindVector(const char *Name) const;
+   std::vector<std::string> FindVector(std::string const &Name) const { return FindVector(Name.c_str()); };
+   int FindI(const char *Name,int const &Default = 0) const;
+   int FindI(std::string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);};
+   bool FindB(const char *Name,bool const &Default = false) const;
+   bool FindB(std::string const &Name,bool const &Default = false) const {return FindB(Name.c_str(),Default);};
+   std::string FindAny(const char *Name,const char *Default = 0) const;

              
              

-   inline void Set(const string Name,string Value) {Set(Name.c_str(),Value);};
-   void CndSet(const char *Name,const string &Value);
-   void Set(const char *Name,const string &Value);
-   void Set(const char *Name,int Value);   
+   inline void Set(const std::string &Name,const std::string &Value) {Set(Name.c_str(),Value);};
+   void CndSet(const char *Name,const std::string &Value);
+   void CndSet(const char *Name,const int Value);
+   void Set(const char *Name,const std::string &Value);
+   void Set(const char *Name,const int &Value);

    
    

-   inline bool Exists(const string Name) const {return Exists(Name.c_str());};
+   inline bool Exists(const std::string &Name) const {return Exists(Name.c_str());};

    bool Exists(const char *Name) const;
    bool ExistsAny(const char *Name) const;
 
    // clear a whole tree
    bool Exists(const char *Name) const;
    bool ExistsAny(const char *Name) const;
 
    // clear a whole tree

-   void Clear(const string Name);
+   void Clear(const std::string &Name);

 
    // remove a certain value from a list (e.g. the list of "APT::Keep-Fds")
 
    // remove a certain value from a list (e.g. the list of "APT::Keep-Fds")

-   void Clear(const string List, string Value);
-   void Clear(const string List, int Value);
+   void Clear(std::string const &List, std::string const &Value);
+   void Clear(std::string const &List, int const &Value);

 
    inline const Item *Tree(const char *Name) const {return Lookup(Name);};
 
 
    inline const Item *Tree(const char *Name) const {return Lookup(Name);};
 


@@ -100,16 +103,34 @@ class Configuration
    Configuration(const Item *Root);
    Configuration();
    ~Configuration();
    Configuration(const Item *Root);
    Configuration();
    ~Configuration();

+
+   /** \brief match a string against a configurable list of patterns */
+   class MatchAgainstConfig
+   {
+     std::vector<regex_t *> patterns;
+     void clearPatterns();
+
+   public:
+     MatchAgainstConfig(char const * Config);
+     virtual ~MatchAgainstConfig();
+
+     /** \brief Returns \b true for a string matching one of the patterns */
+     bool Match(char const * str) const;
+     bool Match(std::string const &str) const { return Match(str.c_str()); };
+
+     /** \brief returns if the matcher setup was successful */
+     bool wasConstructedSuccessfully() const { return patterns.empty() == false; }
+   };

 };
 
 extern Configuration *_config;
 
 };
 
 extern Configuration *_config;
 

-bool ReadConfigFile(Configuration &Conf,const string &FName,
-                   bool AsSectional = false,
-                   unsigned Depth = 0);
+bool ReadConfigFile(Configuration &Conf,const std::string &FName,
+                   bool const &AsSectional = false,
+                   unsigned const &Depth = 0);

 
 

-bool ReadConfigDir(Configuration &Conf,const string &Dir,
-                  bool AsSectional = false,
-                  unsigned Depth = 0);
+bool ReadConfigDir(Configuration &Conf,const std::string &Dir,
+                  bool const &AsSectional = false,
+                  unsigned const &Depth = 0);

 
 #endif
 
 #endif