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

fixed FindNext finding empty filename

Browse Source 
git-svn-id: trunk@7597 -
This commit is contained in:
mattias 2005-08-30 17:41:53 +00:00
parent f9c8897739
commit 193756ef59
17 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/codetools/definetemplates.pas
View File

@ -3050,7 +3050,8 @@ var
if FindFirst(ADirPath+FileMask,faAnyFile,FileInfo)=0 then begin
repeat
AFilename:=FileInfo.Name;
if (AFilename='.') or (AFilename='..') then continue;
if (AFilename='') or (AFilename='.') or (AFilename='..') then
continue;
//debugln('Browse Filename=',AFilename,' IsDir=',(FileInfo.Attr and faDirectory)>0);
i:=High(IgnoreDirs);
while (i>=Low(IgnoreDirs)) and (AFilename<>IgnoreDirs[i]) do dec(i);

4
components/codetools/stdcodetools.pas
View File

@ -683,7 +683,9 @@ function TStandardCodeTool.FixUnitInFilenameCaseInUsesSection(
begin
repeat
// check if special file
if (FileInfo.Name='.') or (FileInfo.Name='..') then continue;
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='')
then
continue;
if (SysUtils.CompareText(CurFilename,FileInfo.Name)=0)
then begin
if (Result='') or (FileInfo.Name=CurFilename) then

9
components/projecttemplates/projecttemplates.pp
View File

@ -203,7 +203,7 @@ begin
try
Repeat
If ((Info.Attr and faDirectory)<>0)
and not ((Info.Name='.') or (Info.Name='..')) then
and not ((Info.Name='.') or (Info.Name='..') or (Info.Name='')) then
With Add as TProjectTemplate do
InitFromDir(D+Info.Name);
Until FindNext(Info)<>0;
@ -400,7 +400,7 @@ begin
try
repeat
if ((Info.attr and faDirectory)<>0) and
(Info.Name<>'.') and (info.Name<>'..') then
(Info.Name<>'.') and (info.Name<>'..') and (Info.Name<>'') then
GetFileList(Dir+Info.Name+PathSeparator);
until FindNext(Info)<>0;
finally
@ -435,8 +435,9 @@ begin
try
repeat
if ((Info.attr and faDirectory)<>0) and
(Info.Name<>'.') and (info.Name<>'..') then
CopyAndSubstituteDir(D1+Info.Name,D2+SubstituteString(Info.Name,Values),Values);
(Info.Name<>'.') and (info.Name<>'..') and (Info.Name<>'')
then
CopyAndSubstituteDir(D1+Info.Name,D2+SubstituteString(Info.Name,Values),Values);
until FindNext(Info)<>0;
finally
FindClose(Info);

2
examples/codepageconverter/filefind/filefind.pas
View File

@ -238,7 +238,7 @@ var
var
dirq : TSearchRec;
begin
if assigned(fChangeFolderEvent) then
if assigned(fChangeFolderEvent) then
fChangeFolderEvent(fullpath,FolderInfo);
doserror := findfirst(fullpath+sfi,attr,dirq);

6
examples/codepageconverter/mainunit.pas
View File

@ -246,8 +246,10 @@ begin
if FindFirst(directory + msk, faDirectory, search) = 0 then
begin
repeat
if ((search.Attr and faDirectory) = faDirectory) and (search.Name[1] <> '.') then
GetAllFiles(directory + search.Name + delimeter + ExtractFileName(mask),unignore,subdirs);
if ((search.Attr and faDirectory) = faDirectory)
and (search.Name[1] <> '.') and (search.Name<>'') then
GetAllFiles(directory + search.Name + delimeter + ExtractFileName(mask),
unignore,subdirs);
until FindNext(search) <> 0;
FindClose(search);
end;

3
examples/imgviewer/frmmain.pas
View File

@ -234,8 +234,7 @@ begin
if FindFirst(Directory+'*',faDirectory,Info)=0 then
try
Repeat
If (Info.Name<>'.') and
(info.name<>'..') and
If (Info.Name<>'.') and (Info.Name<>'') and (info.name<>'..') and
((Info.Attr and faDirectory)<>0) then
AddDir(Directory+Info.name,True);
until (FindNext(Info)<>0)

3
ide/cleandirdlg.pas
View File

@ -283,7 +283,8 @@ var
then begin
repeat
// check if special file
if (FileInfo.Name='.') or (FileInfo.Name='..') then continue;
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='')
then continue;
FullFilename:=MainDirectory+FileInfo.Name;
if (FileInfo.Attr and faDirectory)>0 then begin
if SubDirsCheckbox.Checked then begin

6
ide/frmsearch.pas
View File

@ -394,7 +394,7 @@ begin
begin
repeat
// check if special file, skip directories this time
if (FileInfo.Name='.') or (FileInfo.Name='..')
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='')
or ((faDirectory and FileInfo.Attr)>0) then continue;
//Make sure this is a text file as it will be searched
if FileIsReadable(TempDir + FileInfo.Name)
@ -425,7 +425,9 @@ begin
// check if directory and not special file
if ((faDirectory and FileInfo.Attr)>0)
and (FileInfo.Name<>'.') and (FileInfo.Name<>'..')
then DoFindInFiles(TempDir + FileInfo.Name);
and (FileInfo.Name<>'')
then
DoFindInFiles(TempDir + FileInfo.Name);
if fAbort and not fAborting then
begin
fAborting:= True;

12
ide/ideprocs.pp
View File

@ -261,7 +261,8 @@ begin
then begin
repeat
// check if special file
if (FileInfo.Name='.') or (FileInfo.Name='..') then continue;
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='') then
continue;
if (AnsiCompareText(CaseInsensitiveFilename,FileInfo.Name)=0)
and ((not IgnoreExact)
or (CompareFilenames(CaseInsensitiveFilename,FileInfo.Name)<>0))
@ -297,7 +298,8 @@ begin
ShortFilename:=ExtractFilename(Filename);
repeat
// check if special file
if (FileInfo.Name='.') or (FileInfo.Name='..') then continue;
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='') then
continue;
if CompareFilenames(ShortFilename,FileInfo.Name)=0 then begin
Result:=FileInfo.Name;
break;
@ -749,7 +751,8 @@ begin
then begin
repeat
// check if special file
if (FileInfo.Name='.') or (FileInfo.Name='..') then continue;
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='') then
continue;
// check extension
if CompareFileExt(FileInfo.Name,Ext,false)=0 then begin
Result:=AppendPathDelim(Directory)+FileInfo.Name;
@ -1967,7 +1970,8 @@ var
if SysUtils.FindFirst(CurSrcDir+GetAllFilesMask,faAnyFile,FileInfo)=0 then begin
repeat
// check if special file
if (FileInfo.Name='.') or (FileInfo.Name='..') then continue;
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='')
then continue;
CurFilename:=CurSrcDir+FileInfo.Name;
// check if src file
if FilenameIsMatching(DestDirectory,CurFilename,false) then continue;

4
ide/main.pp
View File

@ -10242,7 +10242,9 @@ var
end;
repeat
// check if special file
if (FileInfo.Name='.') or (FileInfo.Name='..') then continue;
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='')
then
continue;
CurFilename:=CurDirectory+FileInfo.Name;
if FileIsText(CurFilename) then
Files.Add(CurFilename);

3
ide/mainbase.pas
View File

@ -968,6 +968,7 @@ begin
UnitName:=ExtractFilenameOnly(ShortFilename);
repeat
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)
@ -1069,7 +1070,7 @@ begin
FileInfoNeedClose:=true;
if SysUtils.FindFirst(CurDir+GetAllFilesMask,faAnyFile,FileInfo)=0 then begin
repeat
if (FileInfo.Name='.') or (FileInfo.Name='..')
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='')
or ((FileInfo.Attr and faDirectory)<>0) then continue;
if FilenameIsPascalUnit(FileInfo.Name) then
CurUnitTree:=SourceUnitTree

2
ide/translations.pas
View File

@ -180,6 +180,8 @@ begin
if SysUtils.FindFirst(SearchMask,faAnyFile,FileInfo)=0
then begin
repeat
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='')
then continue;
ID:=copy(FileInfo.Name,length('lazaruside.')+1,
length(FileInfo.Name)-length('lazaruside..po'));
//writeln('CollectTranslations A ',FileInfo.Name,' ID=',ID);

6
lcl/dirsel.pas
View File

@ -97,7 +97,7 @@ begin
begin
repeat
// check if special file
if ((FileInfo.Name='.') or (FileInfo.Name='..')) or
if ((FileInfo.Name='.') or (FileInfo.Name='..')) or (FileInfo.Name='')
(((faHidden and FileInfo.Attr)>0) and
IgnoreHidden) then continue;
Result:= ((faDirectory and FileInfo.Attr)>0);
@ -136,7 +136,9 @@ begin
SortList.Sorted:= True;
repeat
// check if special file
if (FileInfo.Name='.') or (FileInfo.Name='..') then continue;
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='')
then
continue;
// if this is a directory then add it to the tree.
if ((faDirectory and FileInfo.Attr)>0) then
begin

3
lcl/include/fileutil.inc
View File

@ -750,7 +750,8 @@ begin
if SysUtils.FindFirst(CurSrcDir+GetAllFilesMask,faAnyFile,FileInfo)=0 then begin
repeat
// check if special file
if (FileInfo.Name='.') or (FileInfo.Name='..') then continue;
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='') then
continue;
CurFilename:=CurSrcDir+FileInfo.Name;
if (FileInfo.Attr and faDirectory)>0 then begin
if not DeleteDirectory(CurFilename,false) then exit;

2
lcl/interfaces/gtk/gtkproc.inc
View File

@ -3331,7 +3331,7 @@ begin
then
repeat
if ((Info.Attr and faDirectory) = faDirectory) and (Info.Name <> '.')
and (Info.Name <> '..') then
and (Info.Name <> '..') and (Info.Name<>'') then
StrList.Add(AppendPathDelim(Info.Name));
until FindNext(Info) <> 0;
FindClose(Info);

3
packager/packagedefs.pas
View File

@ -2778,7 +2778,8 @@ var
then begin
repeat
// check if special file
if (FileInfo.Name='.') or (FileInfo.Name='..') then continue;
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='')
then continue;
Result.Add(FileInfo.Name);
//debugln('AddDirectoryListing ',FileInfo.Name);
until SysUtils.FindNext(FileInfo)<>0;

2
tools/updatepofiles.pas
View File

@ -326,7 +326,7 @@ begin
NameOnly:=LeftStr(Name,length(Name)-length(Ext));
if SysUtils.FindFirst(Path+FindMask,faAnyFile,FileInfo)=0 then begin
repeat
if (FileInfo.Name='.') or (FileInfo.Name='..')
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='')
or (CompareFilenames(FileInfo.Name,Name)=0) then continue;
CurExt:=ExtractFileExt(FileInfo.Name);
if (CompareFilenames(CurExt,'.po')<>0)