paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-21 18:09:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Use ExeSearch instead of FileSearch to find fpc executable

Browse Source 
git-svn-id: trunk@12949 -
This commit is contained in:
joost 2009-03-22 10:04:04 +00:00
parent d4c2a35c75
commit d4d733b173
1 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
utils/fppkg/pkgoptions.pp
View File

@ -433,45 +433,11 @@ end;
procedure TCompilerOptions.InitCompilerDefaults;
// Same as SysUtils.FileSearch but without searching in the current directory
Function FileSearchPath (Const Name, DirList : String) : String;
Var
I : longint;
Temp : String;
begin
Result:=Name;
temp:=SetDirSeparators(DirList);
while True do begin
If Temp = '' then
Break; // No more directories to search - fail
I:=pos(PathSeparator,Temp);
If I<>0 then
begin
Result:=Copy (Temp,1,i-1);
system.Delete(Temp,1,I);
end
else
begin
Result:=Temp;
Temp:='';
end;
If Result<>'' then
Result:=IncludeTrailingPathDelimiter(Result)+name;
If (Result <> '') and FileExists(Result) Then
exit;
end;
result:='';
end;
var
infoSL : TStringList;
begin
FConfigVersion:=CurrentConfigVersion;
// Sysutils.FileSearch cannot be used since it also searches in the current
// directory. Which could lead to a security-problem when some unknown
// 'fpc' executable is lying around.
FCompiler:=FileSearchPath('fpc'+ExeExt,GetEnvironmentVariable('PATH'));
FCompiler:=ExeSearch('fpc'+ExeExt,GetEnvironmentVariable('PATH'));
if FCompiler='' then
Raise EPackagerError.Create(SErrMissingFPC);
// Detect compiler version/target from -i option