* new socketerror scheme. OS/2 and netware are now broken and still must be done. (merge me and all previous socket related commits please)

git-svn-id: trunk@7327 -

rtl/freebsd/unixsock.inc

@@ -20,76 +20,91 @@
 function  fpsocket (domain:cint; xtype:cint; protocol: cint):cint;
 Begin
   fpSocket:=Do_Syscall(syscall_nr_socket,Domain,xtype,Protocol);
+  internal_socketerror:=fpgeterrno;
 End;
 
 function  fpsend (s:cint; msg:pointer; len:size_t; flags:cint):ssize_t;
 begin
   fpSend:=do_syscall(syscall_nr_sendto,S,TSysParam(msg),Len,Flags,0,0);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fpsendto (s:cint; msg:pointer; len:size_t; flags:cint; tox :psockaddr; tolen: tsocklen):ssize_t;
 begin
   fpSendto:=do_syscall(syscall_nr_sendto,S,TSysParam(msg),Len,Flags,TSysParam(tox),tolen);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fprecv (s:cint; buf: pointer; len: size_t; flags:cint):ssize_t;
 begin
   fpRecv:=do_syscall(syscall_nr_Recvfrom,S,tsysparam(buf),len,flags,0,0);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fprecvfrom (s:cint; buf: pointer; len: size_t; flags: cint; from : psockaddr; fromlen : psocklen):ssize_t;
 begin
   fpRecvFrom:=do_syscall(syscall_nr_Recvfrom,S,TSysParam(buf),len,flags,TSysParam(from),TSysParam(fromlen));
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fpbind (s:cint; addrx : psockaddr; addrlen : tsocklen):cint;
 begin
   fpBind:=do_syscall(syscall_nr_Bind,S,TSysParam(addrx),addrlen);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fplisten (s:cint; backlog : cint):cint;
 begin
   fpListen:=do_syscall(syscall_nr_Listen,S,backlog);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fpaccept (s:cint; addrx : psockaddr; addrlen : psocklen):cint;
 begin
   fpAccept:=do_syscall(syscall_nr_accept,S,TSysParam(addrx),TSysParam(addrlen));
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fpconnect (s:cint; name  : psockaddr; namelen : tsocklen):cint;
 begin
   fpConnect:=do_syscall(syscall_nr_connect,S,TSysParam(name),namelen);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fpshutdown (s:cint; how:cint):cint;
 begin
   fpShutDown:=do_syscall(syscall_nr_shutdown,S,how);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fpgetsockname (s:cint; name  : psockaddr; namelen : psocklen):cint;
 begin
   fpGetSockName:=do_syscall(syscall_nr_GetSockName,S,TSysParam(name),TSysParam(namelen));
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fpgetpeername (s:cint; name  : psockaddr; namelen : psocklen):cint;
 begin
   fpGetPeerName:=do_syscall(syscall_nr_GetPeerName,S,TSysParam(name),TSysParam(namelen));
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fpsetsockopt  (s:cint; level:cint; optname:cint; optval:pointer; optlen : tsocklen):cint;
 begin
   fpSetSockOpt:=do_syscall(syscall_nr_SetSockOpt,S,level,optname,TSysParam(optval),optlen);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fpgetsockopt  (s:cint; level:cint; optname:cint; optval:pointer; optlen : psocklen):cint;
 begin
   fpGetSockOpt:=do_syscall(syscall_nr_GetSockOpt,S,level,TSysParam(optname),TSysParam(optval),TSysParam(optlen));
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fpsocketpair (d:cint; xtype:cint; protocol:cint; sv:pcint):cint;
 
 begin
   fpSocketPair:=do_syscall(syscall_nr_SocketPair,d,xtype,protocol,TSysParam(sv));
+  internal_socketerror:=fpgeterrno;
 end;
 

rtl/inc/socketsh.inc

@@ -160,20 +160,7 @@ type
   Tsocket=longint;   {To easy porting code from Kylix libc unit to sockets unit.}
 
 
-{$ifdef Unix}
-   {$define socketerror_defined}
-   property socketerror : cint read fpgeterrno;
-{$endif}
-
-{$ifdef MSWindows}
-   {$define socketerror_defined}
-   property socketerror : cint read WSAGetLastError;
-{$endif}
-
-{$ifndef socketerror_defined}
-Var
-  SocketError:cint;
-{$endif}
+function socketerror : cint; 
 
 function  fpsocket      (domain:cint; xtype:cint; protocol: cint):cint;
 function  fprecv        (s:cint; buf: pointer; len: size_t; flags: cint):ssize_t;

rtl/inc/stdsock.inc

@@ -39,75 +39,90 @@ function fpaccept      (s:cint; addrx : psockaddr; addrlen : psocklen):cint;
 
 begin
  fpaccept:=cfpaccept(s,addrx,addrlen);
+ internal_socketerror:=fpgeterrno; 
 end;
 
 function fpbind (s:cint; addrx : psockaddr; addrlen : tsocklen):cint;
 begin
   fpbind:=cfpbind (s,addrx,addrlen);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fpconnect     (s:cint; name  : psockaddr; namelen : tsocklen):cint;
 begin
   fpconnect:=cfpconnect (s,name,namelen);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fpgetpeername (s:cint; name  : psockaddr; namelen : psocklen):cint;
 begin
   fpgetpeername:=cfpgetpeername (s,name,namelen);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fpgetsockname (s:cint; name  : psockaddr; namelen : psocklen):cint;
 begin
   fpgetsockname:=cfpgetsockname(s,name,namelen);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fpgetsockopt  (s:cint; level:cint; optname:cint; optval:pointer; optlen : psocklen):cint;
 begin
   fpgetsockopt:=cfpgetsockopt(s,level,optname,optval,optlen);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fplisten      (s:cint; backlog : cint):cint;
 begin
   fplisten:=cfplisten(s,backlog);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fprecv         (s:cint; buf: pointer; len: size_t; flags:cint):ssize_t;
 begin
   fprecv:= cfprecv      (s,buf,len,flags);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fprecvfrom    (s:cint; buf: pointer; len: size_t; flags: cint; from : psockaddr; fromlen : psocklen):ssize_t;
 begin
   fprecvfrom:= cfprecvfrom (s,buf,len,flags,from,fromlen);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fpsend         (s:cint; msg:pointer; len:size_t; flags:cint):ssize_t;
 begin
   fpsend:=cfpsend (s,msg,len,flags);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fpsendto       (s:cint; msg:pointer; len:size_t; flags:cint; tox :psockaddr; tolen: tsocklen):ssize_t;
 begin
   fpsendto:=cfpsendto (s,msg,len,flags,tox,tolen);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fpsetsockopt  (s:cint; level:cint; optname:cint; optval:pointer; optlen :tsocklen):cint;
 begin
   fpsetsockopt:=cfpsetsockopt(s,level,optname,optval,optlen);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fpshutdown     (s:cint; how:cint):cint;
 begin
   fpshutdown:=cfpshutdown(s,how);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fpsocket       (domain:cint; xtype:cint; protocol: cint):cint;
 begin
   fpsocket:=cfpsocket(domain,xtype,protocol);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function fpsocketpair  (d:cint; xtype:cint; protocol:cint; sv:pcint):cint;
 begin
   fpsocketpair:=cfpsocketpair(d,xtype,protocol,sv);
+  internal_socketerror:=fpgeterrno;
 end;
 

rtl/linux/unixsock.inc

@@ -48,7 +48,7 @@ Const
   Socket_Sys_RECVMSG     = 17;
 
 
-Function SocketCall(SockCallNr,a1,a2,a3,a4,a5,a6:TSysParam):longint;
+Function SocketCall(SockCallNr,a1,a2,a3,a4,a5,a6:TSysParam):longint; inline;
 var
   Args:array[1..6] of TSysParam;
 begin
@@ -65,6 +65,7 @@ end;
 function SocketCall(SockCallNr,a1,a2,a3:TSysParam):longint;
 begin
   SocketCall:=SocketCall(SockCallNr,a1,a2,a3,0,0,0);
+  internal_socketerror:=fpgeterrno;
 end;
 
 function  fpsocket (domain:cint; xtype:cint; protocol: cint):cint;

rtl/unix/sockets.pp

@@ -68,6 +68,8 @@ Implementation
 
 Uses {$ifndef FPC_USE_LIBC}SysCall{$else}initc{$endif};
 
+threadvar internal_socketerror : cint;
+
 { Include filerec and textrec structures }
 {$i filerec.inc}
 {$i textrec.inc}
@@ -75,6 +77,12 @@ Uses {$ifndef FPC_USE_LIBC}SysCall{$else}initc{$endif};
                           Kernel Socket Callings
 ******************************************************************************}
 
+function socketerror:cint;
+
+begin
+  socketerror:=internal_socketerror;
+end;
+
 {$ifndef FPC_USE_LIBC}
 {$i unixsock.inc}
 {$else}
@@ -82,5 +90,4 @@ Uses {$ifndef FPC_USE_LIBC}SysCall{$else}initc{$endif};
 {$endif}
 {$i sockovl.inc}
 {$i sockets.inc}
-
 end.

rtl/win/sockets.pp

@@ -59,6 +59,10 @@ Implementation
 
 //function fpsocket     (domain:cint; xtype:cint; protocol: cint):cint;
 
+function socketerror:cint;
+begin
+ result:=wsagetlasterror;
+end;
 
 function fpsocket       (domain:cint; xtype:cint; protocol: cint):cint;
 begin