* apt-pkg/deb/dpkgpm.cc:

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

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index a523b513e2184f5eb8cddbf0b38f0a9bd6b87936..7588b041c5f537800dabb2e6f349c2e224868fdd 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -22,14 +22,8 @@
 #include <apti18n.h>
 
 #include <vector>
 #include <apti18n.h>
 
 #include <vector>

-#include <algorithm>

 #include <fstream>
 #include <iostream>
 #include <fstream>
 #include <iostream>

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

 
 using namespace std;
                                                                        /*}}}*/
 
 using namespace std;
                                                                        /*}}}*/


@@ -85,7 +79,7 @@ Configuration::~Configuration()
 /* This will lookup a single item by name below another item. It is a 
    helper function for the main lookup function */
 Configuration::Item *Configuration::Lookup(Item *Head,const char *S,
 /* This will lookup a single item by name below another item. It is a 
    helper function for the main lookup function */
 Configuration::Item *Configuration::Lookup(Item *Head,const char *S,

-                                          unsigned long Len,bool Create)
+                                          unsigned long const &Len,bool const &Create)

 {
    int Res = 1;
    Item *I = Head->Child;
 {
    int Res = 1;
    Item *I = Head->Child;


@@ -118,7 +112,7 @@ Configuration::Item *Configuration::Lookup(Item *Head,const char *S,
 // ---------------------------------------------------------------------
 /* This performs a fully scoped lookup of a given name, possibly creating
    new items */
 // ---------------------------------------------------------------------
 /* This performs a fully scoped lookup of a given name, possibly creating
    new items */

-Configuration::Item *Configuration::Lookup(const char *Name,bool Create)
+Configuration::Item *Configuration::Lookup(const char *Name,bool const &Create)

 {
    if (Name == 0)
       return Root->Child;
 {
    if (Name == 0)
       return Root->Child;


@@ -182,9 +176,9 @@ 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 "";
+        return rootDir;

       else
       else

-        return Default;
+        return rootDir + Default;

    }
    
    string val = Itm->Value;
    }
    
    string val = Itm->Value;


@@ -223,10 +217,29 @@ string Configuration::FindDir(const char *Name,const char *Default) const
    return Res;
 }
                                                                        /*}}}*/
    return Res;
 }
                                                                        /*}}}*/

+// Configuration::FindVector - Find a vector of values                 /*{{{*/
+// ---------------------------------------------------------------------
+/* Returns a vector of config values under the given item */
+vector<string> Configuration::FindVector(const char *Name) const
+{
+   vector<string> Vec;
+   const Item *Top = Lookup(Name);
+   if (Top == NULL)
+      return Vec;
+
+   Item *I = Top->Child;
+   while(I != NULL)
+   {
+      Vec.push_back(I->Value);
+      I = I->Next;
+   }
+   return Vec;
+}
+                                                                       /*}}}*/

 // Configuration::FindI - Find an integer value                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Configuration::FindI - Find an integer value                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-int Configuration::FindI(const char *Name,int Default) const
+int Configuration::FindI(const char *Name,int const &Default) const

 {
    const Item *Itm = Lookup(Name);
    if (Itm == 0 || Itm->Value.empty() == true)
 {
    const Item *Itm = Lookup(Name);
    if (Itm == 0 || Itm->Value.empty() == true)


@@ -243,7 +256,7 @@ int Configuration::FindI(const char *Name,int Default) const
 // Configuration::FindB - Find a boolean type                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Configuration::FindB - Find a boolean type                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool Configuration::FindB(const char *Name,bool Default) const
+bool Configuration::FindB(const char *Name,bool const &Default) const

 {
    const Item *Itm = Lookup(Name);
    if (Itm == 0 || Itm->Value.empty() == true)
 {
    const Item *Itm = Lookup(Name);
    if (Itm == 0 || Itm->Value.empty() == true)


@@ -319,7 +332,7 @@ void Configuration::Set(const char *Name,const string &Value)
 // Configuration::Set - Set an integer value                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Configuration::Set - Set an integer value                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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

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


@@ -332,7 +345,7 @@ void Configuration::Set(const char *Name,int Value)
 // Configuration::Clear - Clear an single value from a list            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Configuration::Clear - Clear an single value from a list            /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void Configuration::Clear(const string Name, int Value)
+void Configuration::Clear(string const &Name, int const &Value)

 {
    char S[300];
    snprintf(S,sizeof(S),"%i",Value);
 {
    char S[300];
    snprintf(S,sizeof(S),"%i",Value);


@@ -342,7 +355,7 @@ void Configuration::Clear(const string Name, int Value)
 // Configuration::Clear - Clear an single value from a list            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Configuration::Clear - Clear an single value from a list            /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void Configuration::Clear(const string Name, string Value)
+void Configuration::Clear(string const &Name, string const &Value)

 {
    Item *Top = Lookup(Name.c_str(),false);
    if (Top == 0 || Top->Child == 0)
 {
    Item *Top = Lookup(Name.c_str(),false);
    if (Top == 0 || Top->Child == 0)


@@ -373,7 +386,7 @@ void Configuration::Clear(const string Name, string Value)
 // Configuration::Clear - Clear an entire tree                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Configuration::Clear - Clear an entire tree                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void Configuration::Clear(string Name)
+void Configuration::Clear(string const &Name)

 {
    Item *Top = Lookup(Name.c_str(),false);
    if (Top == 0) 
 {
    Item *Top = Lookup(Name.c_str(),false);
    if (Top == 0) 


@@ -488,15 +501,14 @@ 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,const string &FName,bool AsSectional,
-                   unsigned Depth)
+bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectional,
+                   unsigned const &Depth)

 {   
    // Open the stream for reading
    ifstream F(FName.c_str(),ios::in); 
    if (!F != 0)
       return _error->Errno("ifstream::ifstream",_("Opening configuration file %s"),FName.c_str());
 {   
    // Open the stream for reading
    ifstream F(FName.c_str(),ios::in); 
    if (!F != 0)
       return _error->Errno("ifstream::ifstream",_("Opening configuration file %s"),FName.c_str());

-   
-   char Buffer[1024];
+

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


@@ -508,24 +520,64 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
    bool InComment = false;
    while (F.eof() == false)
    {
    bool InComment = false;
    while (F.eof() == false)
    {

-      F.getline(Buffer,sizeof(Buffer));
+      // The raw input line.
+      std::string Input;
+      // The input line with comments stripped.
+      std::string Fragment;
+
+      // Grab the next line of F and place it in Input.
+      do
+       {
+         char *Buffer = new char[1024];
+
+         F.clear();
+         F.getline(Buffer,sizeof(Buffer) / 2);
+
+         Input += Buffer;
+         delete[] Buffer;
+       }
+      while (F.fail() && !F.eof());
+
+      // Expand tabs in the input line and remove leading and trailing
+      // whitespace.
+      {
+       const int BufferSize = Input.size() * 8 + 1;
+       char *Buffer = new char[BufferSize];
+       try
+         {
+           memcpy(Buffer, Input.c_str(), Input.size() + 1);
+
+           _strtabexpand(Buffer, BufferSize);
+           _strstrip(Buffer);
+           Input = Buffer;
+         }
+       catch(...)
+         {
+           delete[] Buffer;
+           throw;
+         }
+       delete[] Buffer;
+      }

       CurLine++;
       CurLine++;

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

 
 

-      _strtabexpand(Buffer,sizeof(Buffer));
-      _strstrip(Buffer);
+      // Now strip comments; if the whole line is contained in a
+      // comment, skip this line.
+
+      // The first meaningful character in the current fragment; will
+      // be adjusted below as we remove bytes from the front.
+      std::string::const_iterator Start = Input.begin();
+      // The last meaningful character in the current fragment.
+      std::string::const_iterator End = Input.end();

 
       // Multi line comment
       if (InComment == true)
       {
 
       // Multi line comment
       if (InComment == true)
       {

-        for (const char *I = Buffer; *I != 0; I++)
+       for (std::string::const_iterator I = Start;
+            I != End; ++I)

         {
         {

-           if (*I == '*' && I[1] == '/')
+           if (*I == '*' && I + 1 != End && I[1] == '/')

            {
            {

-              memmove(Buffer,I+2,strlen(I+2) + 1);
+              Start = I + 2;

               InComment = false;
               break;
            }       
               InComment = false;
               break;
            }       


@@ -536,57 +588,68 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
       
       // Discard single line comments
       bool InQuote = false;
       
       // Discard single line comments
       bool InQuote = false;

-      for (char *I = Buffer; *I != 0; I++)
+      for (std::string::const_iterator I = Start;
+          I != End; ++I)

       {
         if (*I == '"')
            InQuote = !InQuote;
         if (InQuote == true)
            continue;
       {
         if (*I == '"')
            InQuote = !InQuote;
         if (InQuote == true)
            continue;

-        
-        if (*I == '/' && I[1] == '/')
-         {
-           *I = 0;
+
+        if ((*I == '/' && I + 1 != End && I[1] == '/') ||
+            (*I == '#' && strcmp(string(I,I+6).c_str(),"#clear") != 0 &&
+             strcmp(string(I,I+8).c_str(),"#include") != 0))
+        {
+           End = I;

            break;
         }
       }
 
            break;
         }
       }
 

-      // Look for multi line comments
+      // Look for multi line comments and build up the
+      // fragment.
+      Fragment.reserve(End - Start);

       InQuote = false;
       InQuote = false;

-      for (char *I = Buffer; *I != 0; I++)
+      for (std::string::const_iterator I = Start;
+          I != End; ++I)

       {
         if (*I == '"')
            InQuote = !InQuote;
         if (InQuote == true)
       {
         if (*I == '"')
            InQuote = !InQuote;
         if (InQuote == true)

-           continue;
-        
-        if (*I == '/' && I[1] == '*')
+          Fragment.push_back(*I);
+        else if (*I == '/' && I + 1 != End && I[1] == '*')

          {
            InComment = true;
          {
            InComment = true;

-           for (char *J = Buffer; *J != 0; J++)
+           for (std::string::const_iterator J = I;
+                J != End; ++J)

            {
            {

-              if (*J == '*' && J[1] == '/')
+              if (*J == '*' && J + 1 != End && J[1] == '/')

               {
               {

-                 memmove(I,J+2,strlen(J+2) + 1);
+                 // Pretend we just finished walking over the
+                 // comment, and don't add anything to the output
+                 // fragment.
+                 I = J + 1;

                  InComment = false;
                  break;
               }               
            }
            
            if (InComment == true)
                  InComment = false;
                  break;
               }               
            }
            
            if (InComment == true)

-           {
-              *I = 0;
-              break;
-           }       
+             break;

         }
         }

+        else
+          Fragment.push_back(*I);

       }
       }

-      
-      // Blank
-      if (Buffer[0] == 0)
+
+      // Skip blank lines.
+      if (Fragment.empty())

         continue;
       
         continue;
       

-      // We now have a valid line fragment
+      // The line has actual content; interpret what it means.

       InQuote = false;
       InQuote = false;

-      for (char *I = Buffer; *I != 0;)
+      Start = Fragment.begin();
+      End = Fragment.end();
+      for (std::string::const_iterator I = Start;
+          I != End; ++I)

       {
         if (*I == '"')
            InQuote = !InQuote;
       {
         if (*I == '"')
            InQuote = !InQuote;


@@ -594,18 +657,21 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
         if (InQuote == false && (*I == '{' || *I == ';' || *I == '}'))
         {
            // Put the last fragment into the buffer
         if (InQuote == false && (*I == '{' || *I == ';' || *I == '}'))
         {
            // Put the last fragment into the buffer

-           char *Start = Buffer;
-           char *Stop = I;
-           for (; Start != I && isspace(*Start) != 0; Start++);
-           for (; Stop != Start && isspace(Stop[-1]) != 0; Stop--);
-           if (LineBuffer.empty() == false && Stop - Start != 0)
+           std::string::const_iterator NonWhitespaceStart = Start;
+           std::string::const_iterator NonWhitespaceStop = I;
+           for (; NonWhitespaceStart != I && isspace(*NonWhitespaceStart) != 0; NonWhitespaceStart++)
+             ;
+           for (; NonWhitespaceStop != NonWhitespaceStart && isspace(NonWhitespaceStop[-1]) != 0; NonWhitespaceStop--)
+             ;
+           if (LineBuffer.empty() == false && NonWhitespaceStop - NonWhitespaceStart != 0)

               LineBuffer += ' ';
               LineBuffer += ' ';

-           LineBuffer += string(Start,Stop - Start);
-           
-           // Remove the fragment
+           LineBuffer += string(NonWhitespaceStart, NonWhitespaceStop);
+
+           // Drop this from the input string, saving the character
+           // that terminated the construct we just closed. (i.e., a
+           // brace or a semicolon)

            char TermChar = *I;
            char TermChar = *I;

-           memmove(Buffer,I + 1,strlen(I + 1) + 1);
-           I = Buffer;
+           Start = I + 1;

            
            // Syntax Error
            if (TermChar == '{' && LineBuffer.empty() == true)
            
            // Syntax Error
            if (TermChar == '{' && LineBuffer.empty() == true)


@@ -727,15 +793,32 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
            }
            
         }
            }
            
         }

-        else
-           I++;

       }
 
       }
 

-      // Store the fragment
-      const char *Stripd = _strstrip(Buffer);
-      if (*Stripd != 0 && LineBuffer.empty() == false)
-        LineBuffer += " ";
-      LineBuffer += Stripd;
+      // Store the remaining text, if any, in the current line buffer.
+
+      // NB: could change this to use string-based operations; I'm
+      // using strstrip now to ensure backwards compatibility.
+      //   -- dburrows 2008-04-01
+      {
+       char *Buffer = new char[End - Start + 1];
+       try
+         {
+           std::copy(Start, End, Buffer);
+           Buffer[End - Start] = '\0';
+
+           const char *Stripd = _strstrip(Buffer);
+           if (*Stripd != 0 && LineBuffer.empty() == false)
+             LineBuffer += " ";
+           LineBuffer += Stripd;
+         }
+       catch(...)
+         {
+           delete[] Buffer;
+           throw;
+         }
+       delete[] Buffer;
+      }

    }
 
    if (LineBuffer.empty() == false)
    }
 
    if (LineBuffer.empty() == false)


@@ -746,39 +829,10 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
 // ReadConfigDir - Read a directory of config files                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ReadConfigDir - Read a directory of config files                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool ReadConfigDir(Configuration &Conf,const string &Dir,bool AsSectional,
-                  unsigned Depth)
-{   
-   DIR *D = opendir(Dir.c_str());
-   if (D == 0)
-      return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
-
-   vector<string> List;
-   
-   for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D))
-   {
-      if (Ent->d_name[0] == '.')
-        continue;
-      
-      // Skip bad file names ala run-parts
-      const char *C = Ent->d_name;
-      for (; *C != 0; C++)
-        if (isalpha(*C) == 0 && isdigit(*C) == 0 && *C != '_' && *C != '-')
-           break;
-      if (*C != 0)
-        continue;
-      
-      // Make sure it is a file and not something else
-      string File = flCombine(Dir,Ent->d_name);
-      struct stat St;
-      if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0)
-        continue;
-      
-      List.push_back(File);      
-   }   
-   closedir(D);
-   
-   sort(List.begin(),List.end());
+bool ReadConfigDir(Configuration &Conf,const string &Dir,
+                  bool const &AsSectional, unsigned const &Depth)
+{
+   vector<string> const List = GetListOfFilesInDir(Dir, "conf", true, true);

 
    // Read the files
    for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)
 
    // Read the files
    for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)