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

* Revised yesterday solution to a more general one. Executeprocess gets

Browse Source 
another parameter, a set type with flags, default = []

git-svn-id: trunk@14572 -
This commit is contained in:
marco 2010-01-07 20:49:28 +00:00
parent 67ae263dd9
commit 8e9a7e14ad
15 changed files with 37 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/amiga/sysutils.pp
View File

@ -583,7 +583,7 @@ begin
Result:=Dos.EnvStr(Index); Result:=Dos.EnvStr(Index);
end; end;
function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString): function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString;Flags:TExecuteFlags=[]):
integer; integer;
var var
CommandLine: AnsiString; CommandLine: AnsiString;
@ -605,7 +605,7 @@ begin
end; end;
function ExecuteProcess (const Path: AnsiString; function ExecuteProcess (const Path: AnsiString;
const ComLine: array of AnsiString): integer; const ComLine: array of AnsiString;Flags:TExecuteFlags=[]): integer;
var var
CommandLine: AnsiString; CommandLine: AnsiString;
I: integer; I: integer;

4
rtl/emx/sysutils.pp
View File

@ -1130,7 +1130,7 @@ end;
{$ASMMODE DEFAULT} {$ASMMODE DEFAULT}
function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString): function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString;Flags:TExecuteFlags=[]):
integer; integer;
var var
HQ: THandle; HQ: THandle;
@ -1199,7 +1199,7 @@ end;
function ExecuteProcess (const Path: AnsiString; function ExecuteProcess (const Path: AnsiString;
const ComLine: array of AnsiString): integer; const ComLine: array of AnsiString;Flags:TExecuteFlags=[]): integer;
var var
CommandLine: AnsiString; CommandLine: AnsiString;

4
rtl/gba/sysutils.pp
View File

@ -261,13 +261,13 @@ begin
result := ''; result := '';
end; end;
function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString): integer; function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString;Flags:TExecuteFlags=[]): integer;
begin begin
result := -1; result := -1;
end; end;
function ExecuteProcess (const Path: AnsiString; function ExecuteProcess (const Path: AnsiString;
const ComLine: array of AnsiString): integer; const ComLine: array of AnsiString;Flags:TExecuteFlags=[]): integer;
begin begin
result := -1; result := -1;
end; end;

4
rtl/go32v2/sysutils.pp
View File

@ -769,7 +769,7 @@ begin
end; end;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString;Flags:TExecuteFlags=[]):integer;
var var
e : EOSError; e : EOSError;
CommandLine: AnsiString; CommandLine: AnsiString;
@ -792,7 +792,7 @@ end;
function ExecuteProcess (const Path: AnsiString; function ExecuteProcess (const Path: AnsiString;
const ComLine: array of AnsiString): integer; const ComLine: array of AnsiString;Flags:TExecuteFlags=[]): integer;
var var
CommandLine: AnsiString; CommandLine: AnsiString;

4
rtl/macos/sysutils.pp
View File

@ -661,7 +661,7 @@ begin
Result:=''; Result:='';
end; end;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString;Flags:TExecuteFlags=[]):integer;
var var
s: AnsiString; s: AnsiString;
wdpath: AnsiString; wdpath: AnsiString;
@ -696,7 +696,7 @@ Begin
Result := 0; Result := 0;
End; End;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: Array Of AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: Array Of AnsiString;Flags:TExecuteFlags=[]):integer;
begin begin
end; end;

4
rtl/morphos/sysutils.pp
View File

@ -577,7 +577,7 @@ begin
Result:=Dos.EnvStr(Index); Result:=Dos.EnvStr(Index);
end; end;
function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString): function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString;Flags:TExecuteFlags=[]):
integer; integer;
var var
tmpPath: AnsiString; tmpPath: AnsiString;
@ -624,7 +624,7 @@ begin
end; end;
function ExecuteProcess (const Path: AnsiString; function ExecuteProcess (const Path: AnsiString;
const ComLine: array of AnsiString): integer; const ComLine: array of AnsiString;Flags:TExecuteFlags=[]): integer;
var var
CommandLine: AnsiString; CommandLine: AnsiString;
I: integer; I: integer;

4
rtl/nds/sysutils.pp
View File

@ -261,13 +261,13 @@ begin
result := ''; result := '';
end; end;
function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString): integer; function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString;Flags:TExecuteFlags=[]): integer;
begin begin
result := -1; result := -1;
end; end;
function ExecuteProcess (const Path: AnsiString; function ExecuteProcess (const Path: AnsiString;
const ComLine: array of AnsiString): integer; const ComLine: array of AnsiString;Flags:TExecuteFlags=[]): integer;
begin begin
result := -1; result := -1;
end; end;

4
rtl/netware/sysutils.pp
View File

@ -533,7 +533,7 @@ begin
end; end;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString;Flags:TExecuteFlags=[]):integer;
var var
e : EOSError; e : EOSError;
@ -557,7 +557,7 @@ end;
function ExecuteProcess (const Path: AnsiString; function ExecuteProcess (const Path: AnsiString;
const ComLine: array of AnsiString): integer; const ComLine: array of AnsiString;Flags:TExecuteFlags=[]): integer;
var var
CommandLine: AnsiString; CommandLine: AnsiString;

4
rtl/netwlibc/sysutils.pp
View File

@ -593,7 +593,7 @@ begin
end; end;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString;Flags:TExecuteFlags=[]):integer;
var var
params:array of AnsiString; params:array of AnsiString;
count,i: longint; count,i: longint;
@ -646,7 +646,7 @@ end;
const maxargs=256; const maxargs=256;
function ExecuteProcess (const Path: AnsiString; function ExecuteProcess (const Path: AnsiString;
const ComLine: array of AnsiString): integer; const ComLine: array of AnsiString;Flags:TExecuteFlags=[]): integer;
var c : comstr; var c : comstr;
i : integer; i : integer;
args : array[0..maxargs+1] of pchar; args : array[0..maxargs+1] of pchar;

7
rtl/objpas/sysutils/osutilsh.inc
View File

@ -12,6 +12,8 @@
**********************************************************************} **********************************************************************}
Type TExecuteFlags = Set of ( ExecInheritsHandles);
{ OS handling utilities } { OS handling utilities }
{$ifdef HAS_OSERROR} {$ifdef HAS_OSERROR}
@ -24,9 +26,8 @@ Function GetEnvironmentString(Index : Integer) : String;
{$IFDEF HAS_SLEEP} {$IFDEF HAS_SLEEP}
procedure Sleep(milliseconds: Cardinal); procedure Sleep(milliseconds: Cardinal);
{$ENDIF} {$ENDIF}
function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString;Flags:TExecuteFlags=[]):integer;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: Array of AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: Array of AnsiString;Flags:TExecuteFlags=[]):integer;
Function GetTempDir(Global : Boolean) : String; Function GetTempDir(Global : Boolean) : String;
Function GetTempDir : String; Function GetTempDir : String;

4
rtl/os2/sysutils.pp
View File

@ -939,7 +939,7 @@ begin
end; end;
function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString): function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString;Flags:TExecuteFlags=[]):
integer; integer;
var var
HQ: THandle; HQ: THandle;
@ -1051,7 +1051,7 @@ end;
function ExecuteProcess (const Path: AnsiString; function ExecuteProcess (const Path: AnsiString;
const ComLine: array of AnsiString): integer; const ComLine: array of AnsiString;Flags:TExecuteFlags=[]): integer;
var var
CommandLine: AnsiString; CommandLine: AnsiString;

4
rtl/unix/sysutils.pp
View File

@ -1141,7 +1141,7 @@ begin
end; end;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString;Flags:TExecuteFlags=[]):integer;
var var
pid : longint; pid : longint;
e : EOSError; e : EOSError;
@ -1206,7 +1206,7 @@ Begin
end; end;
End; End;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: Array Of AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: Array Of AnsiString;Flags:TExecuteFlags=[]):integer;
var var
pid : longint; pid : longint;

4
rtl/watcom/sysutils.pp
View File

@ -776,7 +776,7 @@ begin
end; end;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString;Flags:TExecuteFlags=[]):integer;
var var
e : EOSError; e : EOSError;
@ -800,7 +800,7 @@ end;
function ExecuteProcess (const Path: AnsiString; function ExecuteProcess (const Path: AnsiString;
const ComLine: array of AnsiString): integer; const ComLine: array of AnsiString;Flags:TExecuteFlags=[]): integer;
var var
CommandLine: AnsiString; CommandLine: AnsiString;

28
rtl/win/sysutils.pp
View File

@ -60,10 +60,6 @@ function GetFileVersion(const AFileName: string): Cardinal;
procedure GetFormatSettings; procedure GetFormatSettings;
// OS specific versions for windows, to keep redir working
function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString;ExecInheritsHandles:boolean):integer;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: Array of AnsiString;ExecInheritsHandles:boolean):integer;
implementation implementation
uses uses
@ -841,7 +837,7 @@ begin
end; end;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString;ExecInheritsHandles:boolean):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString;Flags:TExecuteFlags=[]):integer;
// win specific function // win specific function
var var
SI: TStartupInfo; SI: TStartupInfo;
@ -850,7 +846,7 @@ var
l : DWord; l : DWord;
CommandLine : ansistring; CommandLine : ansistring;
e : EOSError; e : EOSError;
ExecInherits : longbool;
begin begin
FillChar(SI, SizeOf(SI), 0); FillChar(SI, SizeOf(SI), 0);
SI.cb:=SizeOf(SI); SI.cb:=SizeOf(SI);
@ -869,8 +865,10 @@ begin
else else
CommandLine := CommandLine + #0; CommandLine := CommandLine + #0;
ExecInherits:=ExecInheritsHandles in Flags;
if not CreateProcess(nil, pchar(CommandLine), if not CreateProcess(nil, pchar(CommandLine),
Nil, Nil, ExecInheritsHandles,$20, Nil, Nil, SI, PI) then Nil, Nil, ExecInherits,$20, Nil, Nil, SI, PI) then
begin begin
e:=EOSError.CreateFmt(SExecuteProcessFailed,[CommandLine,GetLastError]); e:=EOSError.CreateFmt(SExecuteProcessFailed,[CommandLine,GetLastError]);
e.ErrorCode:=GetLastError; e.ErrorCode:=GetLastError;
@ -894,13 +892,7 @@ begin
end; end;
end; end;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: Array of AnsiString;Flags:TExecuteFlags=[]):integer;
// os independant function
begin
result:=Executeprocess(path,comline,false);
end;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: Array of AnsiString;ExecInheritsHandles:boolean):integer;
var var
CommandLine: AnsiString; CommandLine: AnsiString;
@ -913,13 +905,7 @@ begin
CommandLine := CommandLine + ' ' + '"' + ComLine [I] + '"' CommandLine := CommandLine + ' ' + '"' + ComLine [I] + '"'
else else
CommandLine := CommandLine + ' ' + Comline [I]; CommandLine := CommandLine + ' ' + Comline [I];
ExecuteProcess := ExecuteProcess (Path, CommandLine,ExecInheritsHandles); ExecuteProcess := ExecuteProcess (Path, CommandLine,Flags);
end;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: Array of AnsiString):integer;
// os independant function
begin
result:=Executeprocess(path,comline,false);
end; end;
Procedure Sleep(Milliseconds : Cardinal); Procedure Sleep(Milliseconds : Cardinal);

4
rtl/wince/sysutils.pp
View File

@ -647,7 +647,7 @@ begin
end; end;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString;Flags:TExecuteFlags=[]):integer;
var var
PI: TProcessInformation; PI: TProcessInformation;
Proc : THandle; Proc : THandle;
@ -680,7 +680,7 @@ begin
end; end;
end; end;
function ExecuteProcess(Const Path: AnsiString; Const ComLine: Array of AnsiString):integer; function ExecuteProcess(Const Path: AnsiString; Const ComLine: Array of AnsiString;Flags:TExecuteFlags=[]):integer;
var var
CommandLine: AnsiString; CommandLine: AnsiString;