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

LazFileUtils: make ResolveDots a little more consitent w.r.t. having the result ending with a PathDelim. Issue #37188. Do not merge to Fixes 2.2.

Browse Source
This commit is contained in:
Bart 2021-08-20 18:43:19 +02:00
parent 5e0cc9032a
commit 840389dad3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/lazutils/lazfileutils.inc
View File

@ -24,6 +24,7 @@ function ResolveDots(const AFilename: string): string;
var SrcPos, DestPos, Len, DirStart: integer;
c: char;
MacroPos: LongInt;
ResultMustEndWithPathDelim: Boolean;
begin
Len:=length(AFilename);
if Len=0 then exit('');
@ -37,6 +38,13 @@ begin
exit;
{$endif}
//To add some consistency to the outcomes
//Depending on the path the algorithm takes it may remove the trailing PathDelim, so we restore it later if needed
//Issue #37188
//It's a workaround, fee free to implement a better fix
ResultMustEndWithPathDelim := ((Len>2) and (AFilename[Len]='.') and (AFilename[Len-1]='.') and (AFilename[Len-2] in AllowDirectorySeparators)) or
((Len>1) and (AFilename[Len]='.') and (AFilename[Len-1] in AllowDirectorySeparators));
SrcPos:=1;
DestPos:=1;
@ -169,7 +177,7 @@ begin
// foo/. -> foo
// C:foo\. -> C:foo
// C:\. -> C:\
dec(DestPos);
{dec(DestPos); } //Part of issue #37188
end;
break;
end;
@ -194,6 +202,8 @@ begin
Result:='.'
else
SetLength(Result,DestPos-1);
if ResultMustEndWithPathDelim and (Result<>'.') and (Result[Length(Result)]<>PathDelim) then
Result := Result + PathDelim;
end;
function FilenameIsWinAbsolute(const TheFilename: string): boolean;