paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-13 17:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r43208 into '.':

Browse Source 
U    packages/fcl-process/src/processbody.inc
--- Recording mergeinfo for merge of r43208 into '.':
 U   .

# revisions: 43208

git-svn-id: branches/fixes_3_2@43217 -
This commit is contained in:
marco 2019-10-17 19:30:59 +00:00
parent 65ae9d2413
commit c31f787eb2
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/fcl-process/src/processbody.inc
View File

@ -177,9 +177,9 @@ Var
Function DetectXTerm : String;
{$endif unix}
function RunCommandIndir(const curdir:TProcessString;const exename:TProcessString;const commands:array of TProcessString;out outputstring:string; out exitstatus:integer; Options : TProcessOptions = []):integer;
function RunCommandIndir(const curdir:TProcessString;const exename:TProcessString;const commands:array of TProcessString;out outputstring:string; Options : TProcessOptions = []):boolean;
function RunCommand(const exename:TProcessString;const commands:array of TProcessString;out outputstring:string; Options : TProcessOptions = []):boolean;
function RunCommandIndir(const curdir:TProcessString;const exename:TProcessString;const commands:array of TProcessString;out outputstring:string; out exitstatus:integer; Options : TProcessOptions = [];SWOptions:TShowWindowOptions=swoNone):integer;
function RunCommandIndir(const curdir:TProcessString;const exename:TProcessString;const commands:array of TProcessString;out outputstring:string; Options : TProcessOptions = [];SWOptions:TShowWindowOptions=swoNone):boolean;
function RunCommand(const exename:TProcessString;const commands:array of TProcessString;out outputstring:string; Options : TProcessOptions = [];SWOptions:TShowWindowOptions=swoNone):boolean;
function RunCommandInDir(const curdir,cmdline:TProcessString;out outputstring:string):boolean; deprecated;
function RunCommand(const cmdline:TProcessString;out outputstring:string):boolean; deprecated;
@ -593,7 +593,7 @@ end;
Const
ForbiddenOptions = [poRunSuspended,poWaitOnExit];
function RunCommandIndir(const curdir:TProcessString;const exename:TProcessString;const commands:array of TProcessString;out outputstring:string;out exitstatus:integer; Options : TProcessOptions = []):integer;
function RunCommandIndir(const curdir:TProcessString;const exename:TProcessString;const commands:array of TProcessString;out outputstring:string;out exitstatus:integer; Options : TProcessOptions = [];SWOptions:TShowWindowOptions=swoNone):integer;
Var
p : TProcessnamemacro;
i : integer;
@ -602,6 +602,7 @@ begin
p:=DefaultTProcess.create(nil);
if Options<>[] then
P.Options:=Options - ForbiddenOptions;
P.ShowWindow:=SwOptions;
p.Executable:=exename;
if curdir<>'' then
p.CurrentDirectory:=curdir;
@ -633,7 +634,7 @@ begin
if exitstatus<>0 then result:=false;
end;
function RunCommandIndir(const curdir:TProcessString;const exename:TProcessString;const commands:array of TProcessString;out outputstring:string; Options : TProcessOptions = []):boolean;
function RunCommandIndir(const curdir:TProcessString;const exename:TProcessString;const commands:array of TProcessString;out outputstring:string; Options : TProcessOptions = [];SWOptions:TShowWindowOptions=swoNone):boolean;
Var
p : TProcessnamemacro;
i,
@ -643,6 +644,7 @@ begin
p:=DefaultTProcess.create(nil);
if Options<>[] then
P.Options:=Options - ForbiddenOptions;
P.ShowWindow:=SwOptions;
p.Executable:=exename;
if curdir<>'' then
p.CurrentDirectory:=curdir;
@ -673,7 +675,7 @@ begin
if exitstatus<>0 then result:=false;
end;
function RunCommand(const exename:TProcessString;const commands:array of TProcessString;out outputstring:string; Options : TProcessOptions = []):boolean;
function RunCommand(const exename:TProcessString;const commands:array of TProcessString;out outputstring:string; Options : TProcessOptions = [];SWOptions:TShowWindowOptions=swoNone):boolean;
Var
p : TProcessnamemacro;
i,
@ -683,6 +685,7 @@ begin
p:=DefaultTProcess.create(nil);
if Options<>[] then
P.Options:=Options - ForbiddenOptions;
P.ShowWindow:=SwOptions;
p.Executable:=exename;
if high(commands)>=0 then
for i:=low(commands) to high(commands) do