paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-03 16:07:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

LazUtils: Make params of UTF8Process.RunCmdFromPath 'const'. Issue #39005, patch by CudaText man.

Browse Source 
git-svn-id: trunk@65251 -
This commit is contained in:
juha 2021-06-16 21:38:36 +00:00
parent a1e67490c9
commit a312cf8723
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/lazutils/utf8process.pp
View File

@ -51,7 +51,7 @@ type
end;
{$ENDIF}
procedure RunCmdFromPath(ProgramFilename, CmdLineParameters: string);
procedure RunCmdFromPath(const ProgramFilename, CmdLineParameters: string);
function FindFilenameOfCmd(ProgramFilename: string): string;
function GetSystemThreadCount: integer; // guess number of cores
@ -155,33 +155,32 @@ end;
// Runs a short command which should point to an executable in
// the environment PATH
// For example: ProgramFilename=ls CmdLineParameters=-l /home
// Will locate and execute the file /bin/ls
// For example: ProgramFilename='ls' CmdLineParameters='-l /home'
// Will locate and execute the file '/bin/ls'
// If the command isn't found, an exception will be raised
procedure RunCmdFromPath(ProgramFilename, CmdLineParameters: string);
procedure RunCmdFromPath(const ProgramFilename, CmdLineParameters: string);
var
OldProgramFilename: String;
NewProgramFilename: String;
BrowserProcess: TProcessUTF8;
begin
OldProgramFilename:=ProgramFilename;
ProgramFilename:=FindFilenameOfCmd(ProgramFilename);
NewProgramFilename:=FindFilenameOfCmd(ProgramFilename);
if ProgramFilename='' then
raise EFOpenError.Create(Format(lrsProgramFileNotFound, [OldProgramFilename]));
if not FileIsExecutable(ProgramFilename) then
raise EFOpenError.Create(Format(lrsCanNotExecute, [ProgramFilename]));
if NewProgramFilename='' then
raise EFOpenError.Create(Format(lrsProgramFileNotFound, [ProgramFilename]));
if not FileIsExecutable(NewProgramFilename) then
raise EFOpenError.Create(Format(lrsCanNotExecute, [NewProgramFilename]));
// run
BrowserProcess := TProcessUTF8.Create(nil);
try
BrowserProcess.InheritHandles:=false;
// Encloses the executable with "" if its name has spaces
if Pos(' ',ProgramFilename)>0 then
ProgramFilename:='"'+ProgramFilename+'"';
if Pos(' ',NewProgramFilename)>0 then
NewProgramFilename:='"'+NewProgramFilename+'"';
{$Push}
{$WARN SYMBOL_DEPRECATED OFF}
BrowserProcess.CommandLine := ProgramFilename;
BrowserProcess.CommandLine := NewProgramFilename;
if CmdLineParameters<>'' then
BrowserProcess.CommandLine := BrowserProcess.CommandLine + ' ' + CmdLineParameters;
{$Pop}