paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 14:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazUtils: simplify TryGetSymlinkTarget for fpc >= 3.3.1 (used in ReadAllLinks on Windows).

Browse Source
This commit is contained in:
Bart 2024-08-08 21:51:55 +02:00
parent 40d328bb45
commit 27535e6d4a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/lazutils/winlazfileutils.inc
View File

@ -10,6 +10,8 @@ var
US: UnicodeString; US: UnicodeString;
Depth: Integer; Depth: Integer;
//ToDo: remove this workaround when minimal fpc version is increased to fpc 3.4
{$if fpc_fullversion < 30301}
//FileGetSymlinkTarget raises an EDirectoryNotFoundException if the target of the link does not exist. //FileGetSymlinkTarget raises an EDirectoryNotFoundException if the target of the link does not exist.
//This is OK if ExceptionOnError is True, but unwanted if it is False, in which case we simply want to return False //This is OK if ExceptionOnError is True, but unwanted if it is False, in which case we simply want to return False
//Unfortunately due to this behaviou, we cannot return the value for Target if Target does not exists //Unfortunately due to this behaviou, we cannot return the value for Target if Target does not exists
@ -25,12 +27,19 @@ var
on E: EDirectoryNotFoundException do Result := False; on E: EDirectoryNotFoundException do Result := False;
end end
end; end;
{$else}
//since commit 025ad39ef0fc0c1e7624a10fd4299f73f7f65750 the function does not raise an excpeion anymore if the linktarget
//does not exist, but just returns false
function TryGetSymlinkTarget(Fn: UnicodeString; out SymlinkRec: TUnicodeSymlinkRec): Boolean; inline;
begin
Result := FileGetSymlinkTarget(Fn, SymlinkRec);
end;
{$endif}
begin begin
Result := ''; Result := '';
if not TryGetSymlinkTarget(Utf8ToUtf16(Filename), URec) then if not TryGetSymlinkTarget(Utf8ToUtf16(Filename), URec) then
begin begin
if ExceptionOnError then raise EFOpenError.CreateFmt('%s is not a junction or a symbolic link',[Filename]); if ExceptionOnError then raise EFOpenError.CreateFmt('%s is not a valid junction or a symbolic link',[Filename]);
Exit; Exit;
end; end;
Depth := 1; Depth := 1;
@ -48,7 +57,7 @@ begin
US := URec.TargetName; US := URec.TargetName;
if not TryGetSymlinkTarget(US, URec) then if not TryGetSymlinkTarget(US, URec) then
begin begin
if ExceptionOnError then raise EFOpenError.CreateFmt('%s is not a junction or a symbolic link',[Filename]); if ExceptionOnError then raise EFOpenError.CreateFmt('%s is not a valid junction or a symbolic link',[Filename]);
Result := ''; Result := '';
Exit; Exit;
end; end;