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

* weeehoo linuxerror is no more :-)

Browse Source
This commit is contained in:
marco 2003-11-14 17:30:14 +00:00
parent 70ca3f6e50
commit ce9c3bf19c
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rtl/unix/unix.pp
View File

@ -29,9 +29,6 @@ Uses UnixUtil,BaseUnix;
{$I signal.inc} {$I signal.inc}
{$i ostypes.inc} {$i ostypes.inc}
var
LinuxError : Longint;
{******************** {********************
Process Process
********************} ********************}
@ -298,12 +295,15 @@ Function getenv(name:string):Pchar; external name 'FPC_SYSC_FPGETENV';
{ Most calls of WaitPID do not handle the result correctly, this funktion treats errors more correctly } { Most calls of WaitPID do not handle the result correctly, this funktion treats errors more correctly }
Function WaitProcess(Pid:longint):cint; { like WaitPid(PID,@result,0) Handling of Signal interrupts (errno=EINTR), returning the Exitcode of Process (>=0) or -Status if terminated} Function WaitProcess(Pid:longint):cint; { like WaitPid(PID,@result,0) Handling of Signal interrupts (errno=EINTR), returning the Exitcode of Process (>=0) or -Status if terminated}
var r,s : LongInt; var ret,r,s : LongInt;
begin begin
s:=$7F00;
repeat repeat
s:=$7F00;
r:=fpWaitPid(Pid,@s,0); r:=fpWaitPid(Pid,@s,0);
until (r<>-1) or (LinuxError<>ESysEINTR); if (r=-1) and (fpgeterrno=ESysEIntr) Then
r:=0;
until (r<>-1);
if (r=-1) or (r=0) then // 0 is not a valid return and should never occur (it means status invalid when using WNOHANG) if (r=-1) or (r=0) then // 0 is not a valid return and should never occur (it means status invalid when using WNOHANG)
WaitProcess:=-1 // return -1 to indicate an error. fpwaitpid updated it. WaitProcess:=-1 // return -1 to indicate an error. fpwaitpid updated it.
else else
@ -1461,8 +1461,8 @@ var
st : stat; st : stat;
begin begin
dirstream:=fpopendir(n); dirstream:=fpopendir(n);
if (linuxerror<>0) then if (dirstream=nil) then
exit; exit(false);
d:=fpReaddir(dirstream^); d:=fpReaddir(dirstream^);
while (d<>nil) do while (d<>nil) do
begin begin
@ -1632,18 +1632,10 @@ begin
temp:=temp+#0; temp:=temp+#0;
thedir:=fpopendir(@temp[1]); thedir:=fpopendir(@temp[1]);
if thedir=nil then if thedir=nil then
begin exit(nil);
glob:=nil;
linuxerror:=fpgeterrno;;
exit;
end;
temp:=basename(path,''); { get the pattern } temp:=basename(path,''); { get the pattern }
if thedir^.dd_fd<0 then if thedir^.dd_fd<0 then
begin exit(nil);
linuxerror:=fpgeterrno;;
glob:=nil;
exit;
end;
{get the entries} {get the entries}
root:=nil; root:=nil;
current:=nil; current:=nil;
@ -1666,7 +1658,7 @@ begin
end; end;
if current=nil then if current=nil then
begin begin
linuxerror:=ESysENOMEM; fpseterrno(ESysENOMEM);
globfree(root); globfree(root);
break; break;
end; end;
@ -1674,7 +1666,7 @@ begin
getmem(current^.name,length(temp2)+1); getmem(current^.name,length(temp2)+1);
if current^.name=nil then if current^.name=nil then
begin begin
linuxerror:=ESysENOMEM; fpseterrno(ESysENOMEM);
globfree(root); globfree(root);
break; break;
end; end;
@ -1723,7 +1715,10 @@ End.
{ {
$Log$ $Log$
Revision 1.46 2003-11-14 16:44:48 marco Revision 1.47 2003-11-14 17:30:14 marco
* weeehoo linuxerror is no more :-)
Revision 1.46 2003/11/14 16:44:48 marco
* stream functions converted to work without linuxerror * stream functions converted to work without linuxerror
Revision 1.45 2003/11/13 18:44:06 marco Revision 1.45 2003/11/13 18:44:06 marco