disable https->http redirects in libcurl

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

diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 2494c1d7c6d24713c0c2205c90836035555b01fd..8e09ea0a698fd96055494c801cde8c2d876cae87 100644 (file)
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -28,13 +28,15 @@
 #ifndef PKGLIB_CONFIGURATION_H
 #define PKGLIB_CONFIGURATION_H
 
 #ifndef PKGLIB_CONFIGURATION_H
 #define PKGLIB_CONFIGURATION_H
 

-
+#include <regex.h>

 
 #include <string>
 #include <vector>
 #include <iostream>
 
 
 #include <string>
 #include <vector>
 #include <iostream>
 

+#ifndef APT_8_CLEANER_HEADERS

 using std::string;
 using std::string;

+#endif

 
 class Configuration
 {
 
 class Configuration
 {


@@ -42,13 +44,13 @@ class Configuration
    
    struct Item
    {
    
    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) {};
    };


@@ -67,52 +69,74 @@ class Configuration
    
    public:
 
    
    public:
 

-   string Find(const char *Name,const char *Default = 0) const;
-   string Find(string const &Name,const char *Default = 0) const {return Find(Name.c_str(),Default);};
-   string Find(string const &Name, string const &Default) const {return Find(Name.c_str(),Default.c_str());};
-   string FindFile(const char *Name,const char *Default = 0) const;
-   string FindDir(const char *Name,const char *Default = 0) const;
-   std::vector<string> FindVector(string const &Name) const;
-   std::vector<string> FindVector(const char *Name) 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(const char *Name,int const &Default = 0) const;

-   int FindI(string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);};
+   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(const char *Name,bool const &Default = false) const;

-   bool FindB(string const &Name,bool const &Default = false) const {return FindB(Name.c_str(),Default);};
-   string FindAny(const char *Name,const char *Default = 0) 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,const string &Value) {Set(Name.c_str(),Value);};
-   void CndSet(const char *Name,const string &Value);
-   void Set(const char *Name,const string &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);
    
    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);
+   void Clear();

 
    // 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(string const &List, string const &Value);
-   void Clear(string const &List, int const &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 void Dump() { Dump(std::clog); };
    void Dump(std::ostream& str);
 
    inline const Item *Tree(const char *Name) const {return Lookup(Name);};
 
    inline void Dump() { Dump(std::clog); };
    void Dump(std::ostream& str);

+   void Dump(std::ostream& str, char const * const root,
+            char const * const format, bool const emptyValue);

 
    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 ReadConfigFile(Configuration &Conf,const std::string &FName,

                    bool const &AsSectional = false,
                    unsigned const &Depth = 0);
 
                    bool const &AsSectional = false,
                    unsigned const &Depth = 0);
 

-bool ReadConfigDir(Configuration &Conf,const string &Dir,
+bool ReadConfigDir(Configuration &Conf,const std::string &Dir,

                   bool const &AsSectional = false,
                   unsigned const &Depth = 0);
 
                   bool const &AsSectional = false,
                   unsigned const &Depth = 0);