paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 18:39:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* sleeper vfork code copied from deleted parts so it is not lost, made

Browse Source 
shortstring version call the ansistring one.

git-svn-id: trunk@21336 -
This commit is contained in:
marco 2012-05-19 14:03:20 +00:00
parent 6c8eed21c4
commit 725a280059
1 changed files with 22 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
rtl/unix/unix.pp
View File

@ -356,57 +356,12 @@ begin
end; end;
{$else} {$else}
Function fpSystem(const Command:string):cint; Function fpSystem(const Command:string):cint; // deprecated helper.
begin
var fpsystem:=fpsystem(ansistring(command));
pid,savedpid : cint;
pstat : cint;
ign,intact,
quitact : SigactionRec;
newsigblock,
oldsigblock : tsigset;
begin { Changes as above }
if command='' then exit(1);
ign.sa_handler:=SigActionHandler(SIG_IGN);
fpsigemptyset(ign.sa_mask);
ign.sa_flags:=0;
fpsigaction(SIGINT, @ign, @intact);
fpsigaction(SIGQUIT, @ign, @quitact);
fpsigemptyset(newsigblock);
fpsigaddset(newsigblock,SIGCHLD);
fpsigprocmask(SIG_BLOCK,newsigblock,oldsigblock);
pid:=fpfork;
if pid=0 then // We are in the Child
begin
fpsigaction(SIGINT,@intact,NIL);
fpsigaction(SIGQUIT,@quitact,NIL);
fpsigprocmask(SIG_SETMASK,@oldsigblock,NIL);
fpexecl('/bin/sh',['-c',Command]);
fpExit(127); // was exit(127)!! We must exit the Process, not the function
end
else if (pid<>-1) then // Successfull started
begin
savedpid:=pid;
repeat
pid:=fpwaitpid(savedpid,@pstat,0);
until (pid<>-1) and (fpgeterrno()<>ESysEintr);
if pid=-1 Then
fpsystem:=-1
else
fpsystem:=pstat;
end
else // no success
fpsystem:=-1;
fpsigaction(SIGINT,@intact,NIL);
fpsigaction(SIGQUIT,@quitact,NIL);
fpsigprocmask(SIG_SETMASK,@oldsigblock,NIL);
end; end;
Function fpSystem(const Command:AnsiString):cint; Function fpSystem(const Command:AnsiString):cint;
{
AnsiString version of Shell
}
var var
pid,savedpid : cint; pid,savedpid : cint;
pstat : cint; pstat : cint;
@ -414,9 +369,15 @@ var
quitact : SigactionRec; quitact : SigactionRec;
newsigblock, newsigblock,
oldsigblock : tsigset; oldsigblock : tsigset;
{$ifndef SHELL_USE_FPEXEC}
p : ppchar;
{$endif}
begin { Changes as above } begin { Changes as above }
if command='' then exit(1); if command='' then exit(1);
{$ifndef SHELL_USE_FPEXEC}
p:=CreateShellArgv(command);
{$endif}
ign.sa_handler:=SigActionHandler(SIG_IGN); ign.sa_handler:=SigActionHandler(SIG_IGN);
fpsigemptyset(ign.sa_mask); fpsigemptyset(ign.sa_mask);
ign.sa_flags:=0; ign.sa_flags:=0;
@ -425,13 +386,21 @@ begin { Changes as above }
fpsigemptyset(newsigblock); fpsigemptyset(newsigblock);
fpsigaddset(newsigblock,SIGCHLD); fpsigaddset(newsigblock,SIGCHLD);
fpsigprocmask(SIG_BLOCK,newsigblock,oldsigblock); fpsigprocmask(SIG_BLOCK,newsigblock,oldsigblock);
pid:=fpfork; {$ifdef USE_VFORK}
pid:=fpvfork;
{$else USE_VFORK}
pid:=fpfork;
{$endif USE_VFORK}
if pid=0 then // We are in the Child if pid=0 then // We are in the Child
begin begin
fpsigaction(SIGINT,@intact,NIL); fpsigaction(SIGINT,@intact,NIL);
fpsigaction(SIGQUIT,@quitact,NIL); fpsigaction(SIGQUIT,@quitact,NIL);
fpsigprocmask(SIG_SETMASK,@oldsigblock,NIL); fpsigprocmask(SIG_SETMASK,@oldsigblock,NIL);
fpexecl('/bin/sh',['-c',Command]); {$ifndef SHELL_USE_FPEXEC}
fpExecve(p^,p,envp);
{$else}
fpexecl('/bin/sh',['-c',Command]);
{$endif}
fpExit(127); // was exit(127)!! We must exit the Process, not the function fpExit(127); // was exit(127)!! We must exit the Process, not the function
end end
else if (pid<>-1) then // Successfull started else if (pid<>-1) then // Successfull started
@ -450,6 +419,9 @@ begin { Changes as above }
fpsigaction(SIGINT,@intact,NIL); fpsigaction(SIGINT,@intact,NIL);
fpsigaction(SIGQUIT,@quitact,NIL); fpsigaction(SIGQUIT,@quitact,NIL);
fpsigprocmask(SIG_SETMASK,@oldsigblock,NIL); fpsigprocmask(SIG_SETMASK,@oldsigblock,NIL);
{$ifndef SHELL_USE_FPEXEC}
FreeShellArgV(p);
{$endif}
end; end;
{$endif} {$endif}