* some WS fixes

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

diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index bf99f07c2eecd8afe2904b4919e1d804f0335c98..0ed8f59d3853fdd11698bde51dff76ed00db03f9 100644 (file)
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: configuration.h,v 1.10 1999/03/15 08:10:39 jgg Exp $
+// $Id: configuration.h,v 1.16 2002/11/11 06:55:50 doogie Exp $

 /* ######################################################################
 
    Configuration Class
 /* ######################################################################
 
    Configuration Class


@@ -33,9 +33,14 @@
 #endif 
 
 #include <string>
 #endif 
 
 #include <string>

+#include <iostream>
+
+using std::string;

 
 class Configuration
 {
 
 class Configuration
 {

+   public:
+   

    struct Item
    {
       string Value;
    struct Item
    {
       string Value;


@@ -44,42 +49,62 @@ class Configuration
       Item *Child;
       Item *Next;
       
       Item *Child;
       Item *Next;
       

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

       
       

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

    };
    };

+   
+   private:
+   

    Item *Root;
    Item *Root;

+   bool ToFree;

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

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

    public:
 
    public:
 

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

              
    inline void Set(string Name,string Value) {Set(Name.c_str(),Value);};
              
    inline void Set(string Name,string Value) {Set(Name.c_str(),Value);};

+   void CndSet(const char *Name,string Value);

    void Set(const char *Name,string Value);
    void Set(const char *Name,int Value);   
    
    void Set(const char *Name,string Value);
    void Set(const char *Name,int Value);   
    

-   inline bool Exists(string Name) {return Exists(Name.c_str());};
-   bool Exists(const char *Name);
-      
-   inline const Item *Tree(const char *Name) {return Lookup(Name,false);};
+   inline bool Exists(string Name) const {return Exists(Name.c_str());};
+   bool Exists(const char *Name) const;
+   bool ExistsAny(const char *Name) const;

 
 

-   void Dump();
+   void Clear(string Name);

    
    

+   inline const Item *Tree(const char *Name) const {return Lookup(Name);};
+
+   inline void Dump() { Dump(std::clog); };
+   void Dump(std::ostream& str);
+
+   Configuration(const Item *Root);

    Configuration();
    Configuration();

+   ~Configuration();

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

-bool ReadConfigFile(Configuration &Conf,string File);
+bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional = false,
+                   unsigned Depth = 0);
+
+bool ReadConfigDir(Configuration &Conf,string Dir,bool AsSectional = false,
+                   unsigned Depth = 0);

 
 #endif
 
 #endif