mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-14 00:49:09 +02:00
Merged revisions 1261 via svnmerge from
http://hajny@svn.freepascal.org/svn/fpc/trunk git-svn-id: branches/fixes_2_0@1270 -
This commit is contained in:
parent
2f0fa8a41e
commit
d069d3fd32
@ -1351,31 +1351,34 @@ implementation
|
||||
startpc,pc : pchar;
|
||||
sepch : char;
|
||||
begin
|
||||
FindFilePchar:=false;
|
||||
if Assigned (Path) then
|
||||
begin
|
||||
{$ifdef Unix}
|
||||
sepch:=':';
|
||||
sepch:=':';
|
||||
{$else}
|
||||
{$ifdef macos}
|
||||
sepch:=',';
|
||||
sepch:=',';
|
||||
{$else}
|
||||
sepch:=';';
|
||||
sepch:=';';
|
||||
{$endif macos}
|
||||
{$endif Unix}
|
||||
FindFilePchar:=false;
|
||||
pc:=path;
|
||||
repeat
|
||||
startpc:=pc;
|
||||
while (pc^<>sepch) and (pc^<>';') and (pc^<>#0) do
|
||||
inc(pc);
|
||||
move(startpc^,singlepathstring[1],pc-startpc);
|
||||
singlepathstring[0]:=char(longint(pc-startpc));
|
||||
singlepathstring:=FixPath(singlepathstring,false);
|
||||
result:=FileExistsNonCase(singlepathstring,f,FoundFile);
|
||||
if result then
|
||||
exit;
|
||||
if (pc^=#0) then
|
||||
break;
|
||||
inc(pc);
|
||||
until false;
|
||||
pc:=path;
|
||||
repeat
|
||||
startpc:=pc;
|
||||
while (pc^<>sepch) and (pc^<>';') and (pc^<>#0) do
|
||||
inc(pc);
|
||||
move(startpc^,singlepathstring[1],pc-startpc);
|
||||
singlepathstring[0]:=char(longint(pc-startpc));
|
||||
singlepathstring:=FixPath(singlepathstring,false);
|
||||
result:=FileExistsNonCase(singlepathstring,f,FoundFile);
|
||||
if result then
|
||||
exit;
|
||||
if (pc^=#0) then
|
||||
break;
|
||||
inc(pc);
|
||||
until false;
|
||||
end;
|
||||
foundfile:=f;
|
||||
end;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user