Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index d5334ae7205121f28c78869a91592a3418dee99d..fbe180f8ea03cfa620a5d0105aaaf99d48df303f 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -21,10 +21,18 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>

-
+#include <apt-pkg/macros.h>
+
+#include <ctype.h>
+#include <regex.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+#include <string>

 #include <vector>
 #include <fstream>
 #include <vector>
 #include <fstream>

-#include <iostream>

 
 #include <apti18n.h>
 
 
 #include <apti18n.h>
 


@@ -42,8 +50,7 @@ Configuration::Configuration() : ToFree(true)
 }
 Configuration::Configuration(const Item *Root) : Root((Item *)Root), ToFree(false)
 {
 }
 Configuration::Configuration(const Item *Root) : Root((Item *)Root), ToFree(false)
 {

-};
-
+}

                                                                        /*}}}*/
 // Configuration::~Configuration - Destructor                          /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // Configuration::~Configuration - Destructor                          /*{{{*/
 // ---------------------------------------------------------------------


@@ -246,12 +253,20 @@ string Configuration::FindDir(const char *Name,const char *Default) const
 // Configuration::FindVector - Find a vector of values                 /*{{{*/
 // ---------------------------------------------------------------------
 /* Returns a vector of config values under the given item */
 // 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
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
+vector<string> Configuration::FindVector(const char *Name) const { 
+   return FindVector(Name, ""); 
+}
+#endif
+vector<string> Configuration::FindVector(const char *Name, std::string const &Default) const

 {
    vector<string> Vec;
    const Item *Top = Lookup(Name);
    if (Top == NULL)
 {
    vector<string> Vec;
    const Item *Top = Lookup(Name);
    if (Top == NULL)

-      return Vec;
+      return VectorizeString(Default, ',');
+
+   if (Top->Value.empty() == false)
+      return VectorizeString(Top->Value, ',');

 
    Item *I = Top->Child;
    while(I != NULL)
 
    Item *I = Top->Child;
    while(I != NULL)


@@ -259,6 +274,9 @@ vector<string> Configuration::FindVector(const char *Name) const
       Vec.push_back(I->Value);
       I = I->Next;
    }
       Vec.push_back(I->Value);
       I = I->Next;
    }

+   if (Vec.empty() == true)
+      return VectorizeString(Default, ',');
+

    return Vec;
 }
                                                                        /*}}}*/
    return Vec;
 }
                                                                        /*}}}*/


@@ -823,7 +841,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio
            // Go down a level
            if (TermChar == '{')
            {
            // Go down a level
            if (TermChar == '{')
            {

-              if (StackPos <= 100)
+              if (StackPos < sizeof(Stack)/sizeof(std::string))

                  Stack[StackPos++] = ParentTag;
               
               /* Make sectional tags incorperate the section into the
                  Stack[StackPos++] = ParentTag;
               
               /* Make sectional tags incorperate the section into the


@@ -970,7 +988,7 @@ Configuration::MatchAgainstConfig::MatchAgainstConfig(char const * Config)
         continue;
       }
    }
         continue;
       }
    }

-   if (strings.size() == 0)
+   if (strings.empty() == true)

       patterns.push_back(NULL);
 }
                                                                        /*}}}*/
       patterns.push_back(NULL);
 }
                                                                        /*}}}*/