paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-02 21:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: delete ambiguous file: fixed check under case insensitive file systems

Browse Source 
git-svn-id: trunk@21119 -
This commit is contained in:
mattias 2009-08-06 13:42:34 +00:00
parent 6f343b79e0
commit 914107da49
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ide/buildmanager.pas
View File

@ -718,11 +718,16 @@ begin
if (FileInfo.Name='.') or (FileInfo.Name='..')
or (FileInfo.Name='')
or ((FileInfo.Attr and faDirectory)<>0) then continue;
if (ShortFilename=FileInfo.Name) then continue;
if (AnsiCompareText(ShortFilename,FileInfo.Name)<>0)
and ((not IsPascalUnit) or (not FilenameIsPascalUnit(FileInfo.Name))
or (AnsiCompareText(UnitName,ExtractFilenameOnly(FileInfo.Name))<>0))
then
if CompareFilenames(ShortFilename,FileInfo.Name)=0 then continue;
if (SysUtils.CompareText(ShortFilename,FileInfo.Name)=0)
then begin
// same name different case => ambiguous
end else if IsPascalUnit and FilenameIsPascalUnit(FileInfo.Name)
and (SysUtils.CompareText(UnitName,ExtractFilenameOnly(FileInfo.Name))=0)
then begin
// same unit name => ambiguous
end else
continue;
CurFilename:=ADirectory+FileInfo.Name;
@ -743,7 +748,7 @@ begin
end else if EnvironmentOptions.AmbiguousFileAction=afaAutoRename then
begin
Result:=BackupFile(CurFilename);
if Result=mrABort then exit;
if Result=mrAbort then exit;
Result:=mrOk;
end;
until FindNextUTF8(FileInfo)<>0;