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

* if arguments and exename already quoted, then assume the user did it properly. Mantis #22040

Browse Source 
git-svn-id: trunk@21436 -
This commit is contained in:
marco 2012-05-30 17:25:20 +00:00
parent 3a89544cd6
commit 0f88cfed41
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/fcl-process/src/win/process.inc
View File

@ -206,6 +206,14 @@ begin
Result:=S; Result:=S;
end; end;
Function MaybeQuoteIfNotQuoted(Const S : String) : String;
begin
If (Pos(' ',S)<>0) and (pos('"',S)=0) then
Result:='"'+S+'"'
else
Result:=S;
end;
Procedure TProcess.Execute; Procedure TProcess.Execute;
Var Var
@ -237,9 +245,9 @@ begin
PCommandLine:=Pchar(FCommandLine) PCommandLine:=Pchar(FCommandLine)
else if (Fexecutable<>'') then else if (Fexecutable<>'') then
begin begin
Cmd:=MaybeQuote(Executable); Cmd:=MaybeQuoteIfNotQuoted(Executable);
For I:=0 to Parameters.Count-1 do For I:=0 to Parameters.Count-1 do
Cmd:=Cmd+' '+MaybeQuote(Parameters[i]); Cmd:=Cmd+' '+MaybeQuoteIfNotQuoted(Parameters[i]);
PCommandLine:=PChar(Cmd); PCommandLine:=PChar(Cmd);
end; end;
If FCurrentDirectory<>'' then If FCurrentDirectory<>'' then