* wording fixes (cherry picked from apt--mvo)

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

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index b8c806e28524cef4380f586476d0caaca2eedf94..14a000fa5e39a91deb0af015484295d7210b1257 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: configuration.cc,v 1.21 2001/04/29 05:24:42 jgg Exp $
+// $Id: configuration.cc,v 1.28 2004/04/30 04:00:15 mdz Exp $

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


@@ -8,6 +8,9 @@
    This class provides a configuration file and command line parser
    for a tree-oriented configuration environment. All runtime configuration
    is stored in here.
    This class provides a configuration file and command line parser
    for a tree-oriented configuration environment. All runtime configuration
    is stored in here.

+
+   This source is placed in the Public Domain, do with it what you will
+   It was originally written by Jason Gunthorpe <jgg@debian.org>.

    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/


@@ -24,11 +27,14 @@
 #include <vector>
 #include <algorithm>
 #include <fstream>
 #include <vector>
 #include <algorithm>
 #include <fstream>

+#include <iostream>

     
 #include <stdio.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
     
 #include <stdio.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>

+
+using namespace std;

                                                                        /*}}}*/
 
 Configuration *_config = new Configuration;
                                                                        /*}}}*/
 
 Configuration *_config = new Configuration;


@@ -92,7 +98,7 @@ Configuration::Item *Configuration::Lookup(Item *Head,const char *S,
    if (Len != 0)
    {
       for (; I != 0; Last = &I->Next, I = I->Next)
    if (Len != 0)
    {
       for (; I != 0; Last = &I->Next, I = I->Next)

-        if ((Res = stringcasecmp(I->Tag.begin(),I->Tag.end(),S,S + Len)) == 0)
+        if ((Res = stringcasecmp(I->Tag,S,S + Len)) == 0)

            break;
    }
    else
            break;
    }
    else


@@ -104,7 +110,7 @@ Configuration::Item *Configuration::Lookup(Item *Head,const char *S,
       return 0;
    
    I = new Item;
       return 0;
    
    I = new Item;

-   I->Tag = string(S,Len);
+   I->Tag.assign(S,Len);

    I->Next = *Last;
    I->Parent = Head;
    *Last = I;
    I->Next = *Last;
    I->Parent = Head;
    *Last = I;


@@ -155,7 +161,7 @@ string Configuration::Find(const char *Name,const char *Default) const
    if (Itm == 0 || Itm->Value.empty() == true)
    {
       if (Default == 0)
    if (Itm == 0 || Itm->Value.empty() == true)
    {
       if (Default == 0)

-        return string();
+        return "";

       else
         return Default;
    }
       else
         return Default;
    }


@@ -174,7 +180,7 @@ string Configuration::FindFile(const char *Name,const char *Default) const
    if (Itm == 0 || Itm->Value.empty() == true)
    {
       if (Default == 0)
    if (Itm == 0 || Itm->Value.empty() == true)
    {
       if (Default == 0)

-        return string();
+        return "";

       else
         return Default;
    }
       else
         return Default;
    }


@@ -276,7 +282,7 @@ string Configuration::FindAny(const char *Name,const char *Default) const
       case 'i': 
       {
         char buf[16];
       case 'i': 
       {
         char buf[16];

-        snprintf(buf, sizeof(buf)-1, "%d", FindI(key, atoi(Default)));
+        snprintf(buf, sizeof(buf)-1, "%d", FindI(key, Default ? atoi(Default) : 0 ));

         return buf;
       }
    }
         return buf;
       }
    }


@@ -288,7 +294,7 @@ string Configuration::FindAny(const char *Name,const char *Default) const
 // Configuration::CndSet - Conditinal Set a value                      /*{{{*/
 // ---------------------------------------------------------------------
 /* This will not overwrite */
 // Configuration::CndSet - Conditinal Set a value                      /*{{{*/
 // ---------------------------------------------------------------------
 /* This will not overwrite */

-void Configuration::CndSet(const char *Name,string Value)
+void Configuration::CndSet(const char *Name,const string &Value)

 {
    Item *Itm = Lookup(Name,true);
    if (Itm == 0)
 {
    Item *Itm = Lookup(Name,true);
    if (Itm == 0)


@@ -300,7 +306,7 @@ void Configuration::CndSet(const char *Name,string Value)
 // Configuration::Set - Set a value                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Configuration::Set - Set a value                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void Configuration::Set(const char *Name,string Value)
+void Configuration::Set(const char *Name,const string &Value)

 {
    Item *Itm = Lookup(Name,true);
    if (Itm == 0)
 {
    Item *Itm = Lookup(Name,true);
    if (Itm == 0)


@@ -319,6 +325,47 @@ void Configuration::Set(const char *Name,int Value)
    char S[300];
    snprintf(S,sizeof(S),"%i",Value);
    Itm->Value = S;
    char S[300];
    snprintf(S,sizeof(S),"%i",Value);
    Itm->Value = S;

+}
+                                                                       /*}}}*/
+// Configuration::Clear - Clear an single value from a list            /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void Configuration::Clear(const string Name, int Value)
+{
+   char S[300];
+   snprintf(S,sizeof(S),"%i",Value);
+   Clear(Name, S);
+}
+                                                                       /*}}}*/
+// Configuration::Clear - Clear an single value from a list            /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void Configuration::Clear(const string Name, string Value)
+{
+   Item *Top = Lookup(Name.c_str(),false);
+   if (Top == 0 || Top->Child == 0)
+      return;
+
+   Item *Tmp, *Prev, *I;
+   Prev = I = Top->Child;
+
+   while(I != NULL)
+   {
+      if(I->Value == Value)
+      {
+        Tmp = I;
+        // was first element, point parent to new first element
+        if(Top->Child == Tmp)
+           Top->Child = I->Next;
+        I = I->Next;
+        Prev->Next = I;
+        delete Tmp;
+      } else {
+        Prev = I;
+        I = I->Next;
+      }
+   }
+     

 }
                                                                        /*}}}*/
 // Configuration::Clear - Clear an entire tree                         /*{{{*/
 }
                                                                        /*}}}*/
 // Configuration::Clear - Clear an entire tree                         /*{{{*/


@@ -327,10 +374,10 @@ void Configuration::Set(const char *Name,int Value)
 void Configuration::Clear(string Name)
 {
    Item *Top = Lookup(Name.c_str(),false);
 void Configuration::Clear(string Name)
 {
    Item *Top = Lookup(Name.c_str(),false);

-   if (Top == 0)
+   if (Top == 0) 

       return;
       return;

-   
-   Top->Value = string();
+
+   Top->Value.clear();

    Item *Stop = Top;
    Top = Top->Child;
    Stop->Child = 0;
    Item *Stop = Top;
    Top = Top->Child;
    Stop->Child = 0;


@@ -377,13 +424,17 @@ bool Configuration::ExistsAny(const char *Name) const
 {
    string key = Name;
 
 {
    string key = Name;
 

-   if (key.size() > 2 && key.end()[-2] == '/' &&
-       key.find_first_of("fdbi",key.size()-1) < key.size())
-   {
-      key.resize(key.size() - 2);
-      if (Exists(key.c_str()))
-        return true;
-   }
+   if (key.size() > 2 && key.end()[-2] == '/')
+      if (key.find_first_of("fdbi",key.size()-1) < key.size())
+      {
+         key.resize(key.size() - 2);
+         if (Exists(key.c_str()))
+            return true;
+      }
+      else
+      {
+         _error->Warning(_("Unrecognized type abbreviation: '%c'"), key.end()[-3]);
+      }

 
    return Exists(Name);
 }
 
    return Exists(Name);
 }


@@ -391,14 +442,14 @@ bool Configuration::ExistsAny(const char *Name) const
 // Configuration::Dump - Dump the config                               /*{{{*/
 // ---------------------------------------------------------------------
 /* Dump the entire configuration space */
 // Configuration::Dump - Dump the config                               /*{{{*/
 // ---------------------------------------------------------------------
 /* Dump the entire configuration space */

-void Configuration::Dump()
+void Configuration::Dump(ostream& str)

 {
    /* Write out all of the configuration directives by walking the 
       configuration tree */
    const Configuration::Item *Top = Tree(0);
    for (; Top != 0;)
    {
 {
    /* Write out all of the configuration directives by walking the 
       configuration tree */
    const Configuration::Item *Top = Tree(0);
    for (; Top != 0;)
    {

-      clog << Top->FullTag() << " \"" << Top->Value << "\";" << endl;
+      str << Top->FullTag() << " \"" << Top->Value << "\";" << endl;

       
       if (Top->Child != 0)
       {
       
       if (Top->Child != 0)
       {


@@ -434,15 +485,15 @@ string Configuration::Item::FullTag(const Item *Stop) const
    sections like 'zone "foo.org" { .. };' This causes each section to be
    added in with a tag like "zone::foo.org" instead of being split 
    tag/value. AsSectional enables Sectional parsing.*/
    sections like 'zone "foo.org" { .. };' This causes each section to be
    added in with a tag like "zone::foo.org" instead of being split 
    tag/value. AsSectional enables Sectional parsing.*/

-bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
+bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,

                    unsigned Depth)
 {   
    // Open the stream for reading
                    unsigned Depth)
 {   
    // Open the stream for reading

-   ifstream F(FName.c_str(),ios::in | ios::nocreate);
+   ifstream F(FName.c_str(),ios::in); 

    if (!F != 0)
       return _error->Errno("ifstream::ifstream",_("Opening configuration file %s"),FName.c_str());
    
    if (!F != 0)
       return _error->Errno("ifstream::ifstream",_("Opening configuration file %s"),FName.c_str());
    

-   char Buffer[300];
+   char Buffer[1024];

    string LineBuffer;
    string Stack[100];
    unsigned int StackPos = 0;
    string LineBuffer;
    string Stack[100];
    unsigned int StackPos = 0;


@@ -456,6 +507,10 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
    {
       F.getline(Buffer,sizeof(Buffer));
       CurLine++;
    {
       F.getline(Buffer,sizeof(Buffer));
       CurLine++;

+      // This should be made to work instead, but this is better than looping
+      if (F.fail() && !F.eof())
+         return _error->Error(_("Line %d too long (max %d)"), CurLine, sizeof(Buffer));
+

       _strtabexpand(Buffer,sizeof(Buffer));
       _strstrip(Buffer);
 
       _strtabexpand(Buffer,sizeof(Buffer));
       _strstrip(Buffer);
 


@@ -569,7 +624,7 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
            string Tag;
            const char *Pos = LineBuffer.c_str();
            if (ParseQuoteWord(Pos,Tag) == false)
            string Tag;
            const char *Pos = LineBuffer.c_str();
            if (ParseQuoteWord(Pos,Tag) == false)

-              return _error->Error(_("Syntax error %s:%u: Malformed Tag"),FName.c_str(),CurLine);
+              return _error->Error(_("Syntax error %s:%u: Malformed tag"),FName.c_str(),CurLine);

 
            // Parse off the word
            string Word;
 
            // Parse off the word
            string Word;


@@ -656,13 +711,13 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
            }
            
            // Empty the buffer
            }
            
            // Empty the buffer

-           LineBuffer = string();
+           LineBuffer.clear();

            
            // Move up a tag, but only if there is no bit to parse
            if (TermChar == '}')
            {
               if (StackPos == 0)
            
            // Move up a tag, but only if there is no bit to parse
            if (TermChar == '}')
            {
               if (StackPos == 0)

-                 ParentTag = string();
+                 ParentTag.clear();

               else
                  ParentTag = Stack[--StackPos];
            }
               else
                  ParentTag = Stack[--StackPos];
            }


@@ -687,8 +742,8 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
 // ReadConfigDir - Read a directory of config files                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ReadConfigDir - Read a directory of config files                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool ReadConfigDir(Configuration &Conf,string Dir,bool AsSectional,
-                   unsigned Depth)
+bool ReadConfigDir(Configuration &Conf,const string &Dir,bool AsSectional,
+                  unsigned Depth)

 {   
    DIR *D = opendir(Dir.c_str());
    if (D == 0)
 {   
    DIR *D = opendir(Dir.c_str());
    if (D == 0)