From 6132c2ef3066e813acb1237afeca266f32c53a21 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Sat, 28 Nov 2009 16:00:34 +0100 Subject: Engine and VFS API cleanup * also split threaded operations into UCoreWorkers.pas * symlinks should be properly resolved now, even in archives * no more relative/absolute path confusion * moved FillDirFiles outside engines, made it more universal --- UCoreUtils.pas | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'UCoreUtils.pas') diff --git a/UCoreUtils.pas b/UCoreUtils.pas index 95ca5a8..203fbc7 100644 --- a/UCoreUtils.pas +++ b/UCoreUtils.pas @@ -761,9 +761,9 @@ var Path : string; function CaseDirExists(DPath, DFileName: string): boolean; begin if (WideCompareStr(Pattern, FileName) <> 0) and (WideCompareText(Pattern, FileName) = 0) and Directory and - Engine.TwoSameFiles(DPath + Pattern, DPath + FileName) + Engine.TwoSameFiles(DPath + Pattern, DPath + FileName, True) then Result := False - else Result := Engine.DirectoryExists(DPath + DFileName); + else Result := Engine.DirectoryExists(DPath + DFileName, True); end; @@ -1509,11 +1509,11 @@ begin 4 : if Data1^.Size > Data2^.Size then Result := -1 else if Data1^.Size < Data2^.Size then Result := 1 else Result := CompareTextsEx(Data1^.FDisplayName, Data2^.FDisplayName); - 5, 6 : if Data1^.ModifyTime > Data2^.ModifyTime then Result := -1 else - if Data1^.ModifyTime < Data2^.ModifyTime then Result := 1 else + 5, 6 : if Data1^.mtime > Data2^.mtime then Result := -1 else + if Data1^.mtime < Data2^.mtime then Result := 1 else Result := CompareTextsEx(Data1^.FDisplayName, Data2^.FDisplayName); - 7 : if StripDate(Data1^.ModifyTime) > StripDate(Data2^.ModifyTime) then Result := -1 else - if StripDate(Data1^.ModifyTime) < StripDate(Data2^.ModifyTime) then Result := 1 else + 7 : if StripDate(Data1^.mtime) > StripDate(Data2^.mtime) then Result := -1 else + if StripDate(Data1^.mtime) < StripDate(Data2^.mtime) then Result := 1 else Result := CompareTextsEx(Data1^.FDisplayName, Data2^.FDisplayName); 8 : if Data1^.UID > Data2^.UID then Result := -1 else if Data1^.UID < Data2^.UID then Result := 1 else -- cgit v1.2.3