mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Find files - exclude multiple relative subdirectories

Browse source
This commit is contained in:
Alexander Koblov 2023-02-15 19:17:46 +03:00
commit ccb6556486
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ufindfiles.pas
View file

@ -5,7 +5,7 @@
Copyright (C) 2003-2004 Radek Cervinka (radek.cervinka@centrum.cz)
Copyright (C) 2010 Przemys³aw Nagay (cobines@gmail.com)
Copyright (C) 2006-2018 Alexander Koblov (alexx2000@mail.ru)
Copyright (C) 2006-2023 Alexander Koblov (alexx2000@mail.ru)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -427,14 +427,20 @@ begin
end;
function CheckDirectoryNameRelative(const FileChecks: TFindFileChecks; const FullPath, BasePath: String): Boolean;
var
APath: String;
begin
Result := True;
with FileChecks do
begin
// Check if FullPath is a path relative to BasePath.
if GetPathType(ExcludeDirectories) = ptRelative then
for APath in ExcludeDirectories.Split([';'], TStringSplitOptions.ExcludeEmpty) do
begin
Result := ExcludeDirectories <> ExtractDirLevel(BasePath, FullPath);
// Check if FullPath is a path relative to BasePath.
if GetPathType(APath) = ptRelative then
begin
if MatchesMask(ExtractDirLevel(BasePath, FullPath), APath) then
Exit(False);
end;
end;
end;
end;