paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-23 04:39:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 48854 #a64855cad9, 48858 #b727702265 from trunk:

Browse Source 
LazUtils: TFileSearcher.Search: if SearchPath is empty, search current directory.
........
LazUtils: TFileSearcher.Search: do not remove directories that are subdirectories of another directory rom ASearchPath,
when ASearchSubDirs is False. Issue #0027965.
........

git-svn-id: branches/fixes_1_4@48863 -
This commit is contained in:
maxim 2015-04-25 18:44:25 +00:00
parent 64bec6f450
commit 68ad043d77
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/lazutils/fileutil.inc
View File

@ -1156,21 +1156,27 @@ begin
begin
OtherDir:=SearchDirectories[i];
if (CompareFilenames(Dir,OtherDir)=0)
or (FileIsInPath(Dir,OtherDir)) then
or (ASearchSubDirs and (FileIsInPath(Dir,OtherDir))) then
begin
// directory Dir is already searched
Dir:='';
break;
end;
if FileIsInPath(OtherDir,Dir) then
if ASearchSubDirs and FileIsInPath(OtherDir,Dir) then
// directory Dir includes the old directory => delete
SearchDirectories.Delete(i);
end;
if Dir<>'' then
SearchDirectories.Add(Dir);
end;
for i:=0 to SearchDirectories.Count-1 do
DoSearch(AppendPathDelim(SearchDirectories[i]), 0);
//Search currentdirectory if ASearchPath = ''
if (SearchDirectories.Count=0) then
DoSearch('',0)
else
begin
for i:=0 to SearchDirectories.Count-1 do
DoSearch(AppendPathDelim(SearchDirectories[i]), 0);
end;
finally
SearchDirectories.Free;
FSearching := False;