From e756eca77b3fc02647bb0ca74aa669c51f641a22 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Sun, 18 May 2014 13:16:06 +0000
Subject: [PATCH] LCL: Prevent IniPropStorage wiping configuration if
 collection is used. Issue #26112, patch from Luca Olivetti

git-svn-id: trunk@45077 -
---
 lcl/inipropstorage.pas | 137 +----------------------------------------
 1 file changed, 2 insertions(+), 135 deletions(-)

diff --git a/lcl/inipropstorage.pas b/lcl/inipropstorage.pas
index 7a7cdf8b16..f5250ba32f 100644
--- a/lcl/inipropstorage.pas
+++ b/lcl/inipropstorage.pas
@@ -70,138 +70,6 @@ begin
   RegisterComponents('Misc',[TIniPropStorage]);
 end;
 
-{ Should move to strutils when 1.9.6 is out. }
-
-function FindPart(const HelpWilds, InputStr: string): Integer;
-
-var
-  I, J: Integer;
-  Diff: Integer;
-
-begin
-  I := Pos('?', HelpWilds);
-  if I = 0 then begin
-    { if no '?' in HelpWilds }
-    Result := Pos(HelpWilds, InputStr);
-    Exit;
-  end;
-  { '?' in HelpWilds }
-  Diff := Length(InputStr) - Length(HelpWilds);
-  if Diff < 0 then begin
-    Result := 0;
-    Exit;
-  end;
-  { now move HelpWilds over InputStr }
-  for I := 0 to Diff do begin
-    for J := 1 to Length(HelpWilds) do begin
-      if (InputStr[I + J] = HelpWilds[J]) or
-        (HelpWilds[J] = '?') then
-      begin
-        if J = Length(HelpWilds) then begin
-          Result := I + 1;
-          Exit;
-        end;
-      end
-      else Break;
-    end;
-  end;
-  Result := 0;
-end;
-
-
-
-function IsWild(InputStr, Wilds: string; IgnoreCase: Boolean): Boolean;
-
- function SearchNext(var Wilds: string): Integer;
- { looking for next *, returns position and string until position }
- begin
-   Result := Pos('*', Wilds);
-   if Result > 0 then Wilds := Copy(Wilds, 1, Result - 1);
- end;
-
-var
-  CWild, CInputWord: Integer; { counter for positions }
-  I, LenHelpWilds: Integer;
-  MaxInputWord, MaxWilds: Integer; { Length of InputStr and Wilds }
-  HelpWilds: string;
-begin
-  if Wilds = InputStr then begin
-    Result := True;
-    Exit;
-  end;
-  repeat { delete '**', because '**' = '*' }
-    I := Pos('**', Wilds);
-    if I > 0 then
-      Wilds := Copy(Wilds, 1, I - 1) + '*' + Copy(Wilds, I + 2, MaxInt);
-  until I = 0;
-  if Wilds = '*' then begin { for fast end, if Wilds only '*' }
-    Result := True;
-    Exit;
-  end;
-  MaxInputWord := Length(InputStr);
-  MaxWilds := Length(Wilds);
-  if IgnoreCase then begin { upcase all letters }
-    InputStr := AnsiUpperCase(InputStr);
-    Wilds := AnsiUpperCase(Wilds);
-  end;
-  if (MaxWilds = 0) or (MaxInputWord = 0) then begin
-    Result := False;
-    Exit;
-  end;
-  CInputWord := 1;
-  CWild := 1;
-  Result := True;
-  repeat
-    if InputStr[CInputWord] = Wilds[CWild] then begin { equal letters }
-      { goto next letter }
-      Inc(CWild);
-      Inc(CInputWord);
-      Continue;
-    end;
-    if Wilds[CWild] = '?' then begin { equal to '?' }
-      { goto next letter }
-      Inc(CWild);
-      Inc(CInputWord);
-      Continue;
-    end;
-    if Wilds[CWild] = '*' then begin { handling of '*' }
-      HelpWilds := Copy(Wilds, CWild + 1, MaxWilds);
-      I := SearchNext(HelpWilds);
-      LenHelpWilds := Length(HelpWilds);
-      if I = 0 then begin
-        { no '*' in the rest, compare the ends }
-        if HelpWilds = '' then Exit; { '*' is the last letter }
-        { check the rest for equal Length and no '?' }
-        for I := 0 to LenHelpWilds - 1 do begin
-          if (HelpWilds[LenHelpWilds - I] <> InputStr[MaxInputWord - I]) and
-            (HelpWilds[LenHelpWilds - I]<> '?') then
-          begin
-            Result := False;
-            Exit;
-          end;
-        end;
-        Exit;
-      end;
-      { handle all to the next '*' }
-      Inc(CWild, 1 + LenHelpWilds);
-      I := FindPart(HelpWilds, Copy(InputStr, CInputWord, MaxInt));
-      if I= 0 then begin
-        Result := False;
-        Exit;
-      end;
-      CInputWord := I + LenHelpWilds;
-      Continue;
-    end;
-    Result := False;
-    Exit;
-  until (CInputWord > MaxInputWord) or (CWild > MaxWilds);
-  { no completed evaluation }
-  if CInputWord <= MaxInputWord then Result := False;
-  if (CWild <= MaxWilds) and (Wilds[MaxWilds] <> '*') then Result := False;
-end;
-
-
-
 { TCustomIniPropStorage }
 
 function TCustomIniPropStorage.IniFileClass: TIniFileClass;
@@ -277,9 +145,8 @@ begin
   try
     FInifile.ReadSections(Lines);
     for I := 0 to Lines.Count - 1 do begin
-      if (Lines[I] = ARootSection) or
-        (IsWild(Lines[I], ARootSection + '.*', False) or
-        IsWild(Lines[I], ARootSection + '\*', False)) then
+      if SameText(Lines[I],ARootSection) or
+         SameText(Copy(Lines[i],1,Length(ARootSection)+1), ARootSection+'.') then
         FInifile.EraseSection(Lines[I]);
     end;
   finally