From 54d99d9a8a00deef299dbc9fb34a06e4ca6bfe42 Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 23 Jul 2009 15:03:54 +0000 Subject: DirectoryFindFiles unified for mac+unix git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1862 b956fd51-792f-4845-bead-9b4dfca2ff2c --- unicode/src/base/UPlatformMacOSX.pas | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'unicode/src/base/UPlatformMacOSX.pas') diff --git a/unicode/src/base/UPlatformMacOSX.pas b/unicode/src/base/UPlatformMacOSX.pas index 96e4bc63..08ad247d 100644 --- a/unicode/src/base/UPlatformMacOSX.pas +++ b/unicode/src/base/UPlatformMacOSX.pas @@ -288,6 +288,7 @@ begin Result := GetApplicationSupportPath; end; +{ TODO: REMOVE } function TPlatformMacOSX.DirectoryFindFiles(Dir, Filter: WideString; ReturnAllSubDirs: boolean): TDirectoryEntryArray; var i : integer; @@ -298,10 +299,11 @@ begin i := 0; Filter := LowerCase(Filter); - TheDir := FPOpenDir(Dir); + TheDir := FpOpenDir(Dir); if Assigned(TheDir) then + begin repeat - ADirent := FPReadDir(TheDir); + ADirent := FpReadDir(TheDir^); if Assigned(ADirent) and (ADirent^.d_name <> '.') and (ADirent^.d_name <> '..') then begin @@ -323,9 +325,10 @@ begin i := i + 1; end; end; - until ADirent = nil; + until (ADirent = nil); - FPCloseDir(TheDir); + FpCloseDir(TheDir^); + end; end; end. -- cgit v1.2.3