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

Merged revision(s) 56185 #5e7387d21d, 56187 #0d6d2cc04a from trunk:

Browse Source 
lazutils: fixed ResolveDots: ./ -> .
........
LazFileUtils: rename a local variable to improve readability. No functional changes.
........

git-svn-id: branches/fixes_1_8@56240 -
This commit is contained in:
maxim 2017-10-29 22:18:01 +00:00
parent 8e9ba054d3
commit 8be695250e
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/lazutils/lazfileutils.inc
View File

@ -3,7 +3,7 @@
function ResolveDots(const AFilename: string): string;
//trim double path delims and expand special dirs like .. and .
//on Windows change also '/' to '\' except for filenames starting with '\\?\'
var SrcPos, DestPos, l, DirStart: integer;
var SrcPos, DestPos, Len, DirStart: integer;
c: char;
MacroPos: LongInt;
begin
@ -13,13 +13,14 @@ begin
if (Pos('\\?\', AFilename) = 1) then Exit;
{$endif}
l:=length(AFilename);
Len:=length(AFilename);
if Len=0 then exit('');
SrcPos:=1;
DestPos:=1;
// trim double path delimiters and special dirs . and ..
while (SrcPos<=l) do begin
while (SrcPos<=Len) do begin
c:=AFilename[SrcPos];
{$ifdef windows}
//change / to \. The WinApi accepts both, but it leads to strange effects in other places
@ -43,15 +44,17 @@ begin
end;
// check for special dirs . and ..
if (c='.') then begin
if (SrcPos<l) then begin
if (SrcPos<Len) then begin
if (AFilename[SrcPos+1]=PathDelim)
and ((DestPos=1) or (AFilename[SrcPos-1]=PathDelim)) then begin
and ((DestPos=1) or (Result[DestPos-1]=PathDelim)) then begin
// special dir ./ or */./
// -> skip
inc(SrcPos,2);
while (SrcPos<=Len) and (AFilename[SrcPos]=PathDelim) do
inc(SrcPos);
continue;
end else if (AFilename[SrcPos+1]='.')
and (SrcPos+1=l) or (AFilename[SrcPos+2]=PathDelim) then
and ((SrcPos+1=Len) or (AFilename[SrcPos+2]=PathDelim)) then
begin
// special dir ..
// 1. .. -> copy
@ -108,7 +111,7 @@ begin
DestPos:=DirStart;
inc(SrcPos,2);
//writeln('ResolveDots ',DestPos,' SrcPos=',SrcPos,' File="',AFilename,'" Result="',copy(Result,1,DestPos-1),'"');
if SrcPos>l then begin
if SrcPos>Len then begin
// '..' at end of filename
if (DestPos>1) and (Result[DestPos-1]<>PathDelim) then begin
// foo/dir/.. -> foo
@ -120,7 +123,7 @@ begin
end;
end else if DestPos=1 then begin
// e.g. 'foo/../'
while (SrcPos<=l) and (AFilename[SrcPos] in AllowDirectorySeparators) do
while (SrcPos<=Len) and (AFilename[SrcPos] in AllowDirectorySeparators) do
inc(SrcPos);
end;
continue;
@ -144,7 +147,7 @@ begin
Result[DestPos]:=c;
inc(DestPos);
inc(SrcPos);
if (SrcPos>l) then break;
if (SrcPos>Len) then break;
c:=AFilename[SrcPos];
{$ifdef windows}
//change / to \. The WinApi accepts both, but it leads to strange effects in other places
@ -155,7 +158,10 @@ begin
end;
// trim result
if DestPos<=length(AFilename) then
SetLength(Result,DestPos-1);
if (DestPos=1) then
Result:='.'
else
SetLength(Result,DestPos-1);
end;
function FilenameIsWinAbsolute(const TheFilename: string): boolean;