X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/7f25bdff3a0fa55ba897964d5c82475b45f3325a..f58a97d3de5b43fd2cf8c0928939241b7b01c67d:/apt-pkg/contrib/configuration.cc

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index e03001f84..1c58b9881 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: configuration.cc,v 1.11 1999/01/18 06:20:07 jgg Exp $
+// $Id: configuration.cc,v 1.13 1999/07/02 23:17:00 jgg Exp $
 /* ######################################################################
 
    Configuration Class
@@ -17,7 +17,7 @@
 #endif
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
-#include <strutl.h>
+#include <apt-pkg/strutl.h>
 
 #include <stdio.h>
 #include <fstream.h>
@@ -276,6 +276,8 @@ bool ReadConfigFile(Configuration &Conf,string FName)
    
    char Buffer[300];
    string LineBuffer;
+   string Stack[100];
+   unsigned int StackPos = 0;
    
    // Parser state
    string ParentTag;
@@ -376,11 +378,10 @@ bool ReadConfigFile(Configuration &Conf,string FName)
 	    // Move up a tag
 	    if (TermChar == '}')
 	    {
-	       string::size_type Pos = ParentTag.rfind("::");
-	       if (Pos == string::npos)
+	       if (StackPos == 0)
 		  ParentTag = string();
 	       else
-		  ParentTag = string(ParentTag,0,Pos);
+		  ParentTag = Stack[--StackPos];
 	    }
 	    
 	    // Syntax Error
@@ -399,6 +400,8 @@ bool ReadConfigFile(Configuration &Conf,string FName)
 	    // Go down a level
 	    if (TermChar == '{')
 	    {
+	       if (StackPos <= 100)
+		  Stack[StackPos++] = ParentTag;
 	       if (ParentTag.empty() == true)
 		  ParentTag = Tag;
 	       else