* modernized to 2.0.x unix rtl

git-svn-id: trunk@6709 -

utils/debugsvr/console/debugserver.pp

@@ -19,7 +19,7 @@
 program debugserver;
 
 Uses
-  msgintf,debugserverintf,linux,classes,sysutils,getopts,systemlog;
+  msgintf,debugserverintf,baseunix,classes,sysutils,getopts,systemlog;
 
 resourcestring
   SUnknownOption = 'Unknown option : %s';
@@ -54,13 +54,13 @@ Var
 
 begin
   Result:=0;
-  fd_zero(AFDS);
+  fpfd_zero(AFDS);
   For I:=0 to FClients.Count-1 do
     With TClient(FClients[i]) do
       begin
       If Handle>Result then
         Result:=Handle;
-      fd_set(Handle,AFDS);
+      fpfd_set(Handle,AFDS);
       end;
   Inc(Result);
 end;
@@ -75,13 +75,13 @@ Var
 begin
   Repeat
     maxfds:=GetFDS(ReadFDS);
-    TimeOut.sec:=0;
-    TimeOut.usec:=10000;
-    Maxfds:=Select(maxfds,@ReadFDS,Nil,Nil,@TimeOut);
+    TimeOut.tv_sec:=0;
+    TimeOut.tv_usec:=10000;
+    Maxfds:=fpSelect(maxfds,@ReadFDS,Nil,Nil,@TimeOut);
     If MaxFds>0 then
       begin
       For I:=FClients.Count-1 downto 0 do
-        If FD_IsSet(TClient(FClients[i]).Handle,ReadFDS) then
+        If fpFD_IsSet(TClient(FClients[i]).Handle,ReadFDS)<>0 then
           ReadMessage(TClient(FClients[i]).Handle);
       end;
     // Check for new connection.
@@ -97,7 +97,7 @@ Var
 begin
   tv.tv_sec:=1;
   tv.tv_nsec:=0;
-  nanosleep(tv,tr);
+  fpnanosleep(@tv,@tr);
 end;
 
 Procedure HandleConnections;
@@ -120,15 +120,15 @@ Var
 Procedure HandleSig(Sig : Longint); Cdecl;
 
 Var
-  OH : SignalHandler;
+  OH : Signalhandler;
 
 begin
   Quit:=True;
   Case Sig of
-    SIGHUP  : OH:=OldHUPHandler.handler.sh;
-    SIGTERM : OH:=OldTERMHandler.handler.sh;
-    SIGQUIT : OH:=OldQUITHandler.handler.sh;
-    SIGINT  : OH:=OldINTHandler.handler.sh;
+    SIGHUP  : OH:=signalhandler(OldHUPHandler.sa_handler);
+    SIGTERM : OH:=signalhandler(OldTERMHandler.sa_handler);
+    SIGQUIT : OH:=signalhandler(OldQUITHandler.sa_handler);
+    SIGINT  : OH:=signalhandler(OldINTHandler.sa_handler);
   else
     OH:=Nil;
   end;
@@ -143,12 +143,14 @@ Procedure SetupSignals;
   Var
     Act : SigActionRec;
   begin
-    Act.handler.sh:=@HandleSig;
-    Act.sa_mask:=0;
+    signalhandler(Act.sa_handler):=@HandleSig;
+    fpsigemptyset(act.sa_mask);
     Act.SA_FLAGS:=0;
-    Act.Sa_restorer:=Nil;
-    SigAction(Sig,@Act,@OH);
-    If LinuxError<>0 then
+
+{$ifdef linux} // ???
+     Act.Sa_restorer:=Nil;
+  {$endif}
+    if fpSigAction(Sig,@Act,@OH)=-1 then
       begin
       Writeln(stderr,SErrFailedToSetSignalHandler);
       Halt(1)
@@ -209,7 +211,7 @@ Var
   Prefix : String;
 
 begin
- prefix:=format('DebugServer[%d] ',[GetPID]);
+ prefix:=format('DebugServer[%d] ',[fpGetPID]);
  OpenLog(pchar(prefix),LOG_NOWAIT,LOG_DEBUG);
 end;
 

utils/debugsvr/dbugintf.pp

@@ -23,7 +23,7 @@ interface
 
 uses
 {$ifdef fpc}
-   linux,
+   baseunix,
 {$else}
    Libc,
 {$endif}
@@ -222,7 +222,7 @@ begin
 {$else}
       tv.tv_sec:=1;
       tv.tv_nsec:=0;
-      nanosleep(tv,tr);
+      fpnanosleep(@tv,@tr);
 {$endif}
       end;
 {$ifdef fpc}
@@ -251,7 +251,7 @@ begin
   end;
   Msg.MsgType:=lctIdentify;
   Msg.MsgTimeStamp:=Now;
-  Msg.Msg:=Format(SProcessID,[getPID,ExtractFileName(Paramstr(0))]);
+  Msg.Msg:=Format(SProcessID,[fpgetPID,ExtractFileName(Paramstr(0))]);
   WriteMessage(REsult,Msg);
 end;
 

utils/debugsvr/debugserverintf.pp

@@ -19,7 +19,7 @@ unit debugserverintf;
 Interface
 
 Uses
-  msgintf,linux,classes,sockets,sysutils;
+  msgintf,baseunix,classes,sockets,sysutils;
 
 Const
   MsgTypes : Array[-1..3] of string =
@@ -116,9 +116,9 @@ begin
   FSocket:=Socket(AF_UNIX,SOCK_STREAM,0);
   If FSocket<0 Then
     Raise Exception.Create(SErrSocketFailed);
-  Flags:=FCntl(FSOCket,F_GETFL);
-  Flags:=Flags or Open_NONBLOCK;
-  FCntl(FSocket,F_SETFL,Flags);
+  Flags:=fpFCntl(FSOCket,F_GETFL);
+  Flags:=Flags or O_NONBLOCK;
+  fpFCntl(FSocket,F_SETFL,Flags);
   Str2UnixSockAddr(FFilename,FUnixAddr,AddrLen);
   If Not Bind(FSocket,FUnixAddr,AddrLen) then
      Raise Exception.CreateFmt(SErrBindFailed,[FFileName]);
@@ -165,9 +165,9 @@ begin
   FSocket:=Socket(AF_INET,SOCK_STREAM,0);
   If FSocket<0 Then
     Raise Exception.Create(SErrSocketFailed);
-  Flags:=FCntl(FSocket,F_GETFL);
-  Flags:=Flags or Open_NONBLOCK;
-  FCntl(FSocket,F_SETFL,Flags);
+  Flags:=fpFCntl(FSocket,F_GETFL);
+  Flags:=Flags or O_NONBLOCK;
+  fpFCntl(FSocket,F_SETFL,Flags);
   FInetAddr.Family := AF_INET;
   Writeln('Using port : ',APort);
   FInetAddr.Port := Swap(APort);
@@ -243,7 +243,7 @@ begin
     L:=SizeOf(ClientAddr);
     Result:=Accept(FSocket,ClientAddr,L);
     If (Result<0) Then
-      if (Errno<>SYS_EWOULDBLOCK) then
+      if (Errno<>ESYSEAgain) then
         Raise Exception.CreateFmt(SErrAcceptFailed,[FSocket])
       else
         Result:=-1