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

* and more ESysEINTR and fpwaitpid fixing

Browse Source 
git-svn-id: trunk@12929 -
This commit is contained in:
Jonas Maebe 2009-03-19 22:51:41 +00:00
parent 590f4d2efc
commit 803e78ff8c
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rtl/unix/printer.pp
View File

@ -76,7 +76,7 @@ Var
Procedure PrintAndDelete (f:string);
var
i,j : longint;
i: pid_t;
p,pp : ppchar;
begin
f:=f+#0;
@ -99,14 +99,13 @@ begin
pp^:=nil;
fpExecve(lpr,p,envp);
{ In trouble here ! }
halt(128)
fpexit(127)
end
else
begin
{ We're in the parent. }
fpwaitpid (i,@j,0);
if j<>0 then
exit;
if waitprocess(i)<>0 then
exit;
{ Erase the file }
fpUnlink(f);
end;
@ -123,7 +122,7 @@ end;
Procedure OpenLstFile ( Var F : Text);
var
i : longint;
i : cint;
begin
{$IFDEF PRINTERDEBUG}
writeln ('Printer : In OpenLstFile');
@ -131,7 +130,9 @@ begin
If textrec(f).mode <> fmoutput then
exit;
textrec(f).userdata[15]:=0; { set Zero length flag }
i:=fpOpen(StrPas(textrec(f).name),(Open_WrOnly or Open_Creat), 438);
repeat
i:=fpOpen(StrPas(textrec(f).name),(Open_WrOnly or Open_Creat), 438);
until (i<>-1) or (fpgeterrno<>ESysEINTR);
if i<0 then
textrec(f).mode:=fmclosed
else
@ -141,11 +142,15 @@ end;
Procedure CloseLstFile ( Var F : Text);
var
res: cint;
begin
{$IFDEF PRINTERDEBUG}
writeln ('Printer : In CloseLstFile');
{$ENDIF}
fpclose (textrec(f).handle);
repeat
res:=fpclose (textrec(f).handle);
until (res<>-1) or (fpgeterrno<>ESysEINTR);
{ In case length is zero, don't print : lpr would give an error }
if (textrec(f).userdata[15]=0) and (textrec(f).userdata[16]=P_TOF) then
begin
@ -161,6 +166,8 @@ end;
Procedure InOutLstFile ( Var F : text);
var
res: cint;
begin
{$IFDEF PRINTERDEBUG}
writeln ('Printer : In InOutLstFile');
@ -169,7 +176,9 @@ begin
exit;
if textrec(f).bufpos<>0 then
textrec(f).userdata[15]:=1; { Set it is not empty. Important when closing !!}
fpwrite(textrec(f).handle,textrec(f).bufptr^,textrec(f).bufpos);
repeat
res:=fpwrite(textrec(f).handle,textrec(f).bufptr^,textrec(f).bufpos);
until (res<>-1) or (fpgeterrno<>ESysEINTR);
textrec(f).bufpos:=0;
end;