* Fixed 19136 and exposed unix pipe implementation in a separate unit

git-svn-id: trunk@17719 -

.gitattributes

@@ -2198,6 +2198,7 @@ packages/fcl-process/src/dummy/simpleipc.inc svneol=native#text/plain
 packages/fcl-process/src/os2/pipes.inc svneol=native#text/plain
 packages/fcl-process/src/os2/simpleipc.inc svneol=native#text/plain
 packages/fcl-process/src/pipes.pp svneol=native#text/plain
+packages/fcl-process/src/pipesipc.pp svneol=native#text/plain
 packages/fcl-process/src/process.pp svneol=native#text/plain
 packages/fcl-process/src/process.txt svneol=native#text/plain
 packages/fcl-process/src/simpleipc.pp svneol=native#text/plain

packages/fcl-process/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/10/20]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/02]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx haiku
 LIMIT83fs = go32v2 os2 emx watcom
@@ -107,24 +107,36 @@ FPC=$(PP)
 endif
 endif
 ifndef FPC
+DETERMINE_NATIVE_COMPILER=1
+else
+ifdef CROSSCOMPILE
+ifndef FPCFPMAKE
+DETERMINE_NATIVE_COMPILER=1
+endif
+endif
+endif
+ifdef DETERMINE_NATIVE_COMPILER
 FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(FPCPROG),)
 FPCPROG:=$(firstword $(FPCPROG))
 ifneq ($(CPU_TARGET),)
-FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
+FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
 else
-FPC:=$(shell $(FPCPROG) -PB)
+FPCNATIVE:=$(shell $(FPCPROG) -PB)
 endif
-ifneq ($(findstring Error,$(FPC)),)
-override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+ifneq ($(findstring Error,$(FPCNATIVE)),)
+override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
 else
-ifeq ($(strip $(wildcard $(FPC))),)
-FPC:=$(firstword $(FPCPROG))
+ifeq ($(strip $(wildcard $(FPCNATIVE))),)
+FPCNATIVE:=$(firstword $(FPCPROG))
 endif
 endif
 else
-override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+endif
 endif
+ifndef FPC
+FPC=$(FPCNATIVE)
 endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
@@ -264,10 +276,27 @@ ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
+ifndef FPCFPMAKE
+ifdef CROSSCOMPILE
+ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+FPCFPMAKE:=$(FPCNATIVE)
+else
+FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
+FPMAKE_SKIP_CONFIG=-n
+export FPCFPMAKE
+export FPMAKE_SKIP_CONFIG
+endif
+else
+FPCFPMAKE=$(FPC)
+FPMAKE_SKIP_CONFIG=-n
+export FPCFPMAKE
+export FPMAKE_SKIP_CONFIG
+endif
+endif
 override PACKAGE_NAME=fcl-process
 override PACKAGE_VERSION=2.5.1
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_UNITS+=pipes process
@@ -279,34 +308,34 @@ ifeq ($(FULL_TARGET),i386-os2)
 override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 override TARGET_UNITS+=pipes process
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 override TARGET_UNITS+=pipes process
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
@@ -330,16 +359,16 @@ ifeq ($(FULL_TARGET),i386-nativent)
 override TARGET_UNITS+=pipes process
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 override TARGET_UNITS+=pipes process
@@ -348,7 +377,7 @@ ifeq ($(FULL_TARGET),m68k-atari)
 override TARGET_UNITS+=pipes process
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_UNITS+=pipes process
@@ -357,10 +386,10 @@ ifeq ($(FULL_TARGET),m68k-embedded)
 override TARGET_UNITS+=pipes process
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 override TARGET_UNITS+=pipes process
@@ -369,7 +398,7 @@ ifeq ($(FULL_TARGET),powerpc-macos)
 override TARGET_UNITS+=pipes process
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override TARGET_UNITS+=pipes process
@@ -377,29 +406,32 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override TARGET_UNITS+=pipes process
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override TARGET_UNITS+=pipes process
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 override TARGET_UNITS+=pipes process
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
@@ -408,13 +440,13 @@ ifeq ($(FULL_TARGET),x86_64-embedded)
 override TARGET_UNITS+=pipes process
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_UNITS+=pipes process
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
@@ -432,10 +464,10 @@ ifeq ($(FULL_TARGET),arm-symbian)
 override TARGET_UNITS+=pipes process
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_UNITS+=pipes process
@@ -444,13 +476,13 @@ ifeq ($(FULL_TARGET),avr-embedded)
 override TARGET_UNITS+=pipes process
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override TARGET_UNITS+=pipes process
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf
+override TARGET_UNITS+=pipes process  simpleipc dbugmsg dbugintf pipesipc
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_RSTS+=process simpleipc
@@ -563,6 +595,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override TARGET_RSTS+=process simpleipc
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override TARGET_RSTS+=process simpleipc
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override TARGET_RSTS+=process simpleipc
 endif
@@ -750,6 +785,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override COMPILER_OPTIONS+=-S2h
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override COMPILER_OPTIONS+=-S2h
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override COMPILER_OPTIONS+=-S2h
 endif
@@ -936,6 +974,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src  src/unix src/dummy
 endif
@@ -1122,6 +1163,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
@@ -1543,6 +1587,11 @@ ifeq ($(OS_TARGET),NativeNT)
 SHAREDLIBEXT=.dll
 SHORTSUFFIX=nativent
 endif
+ifeq ($(OS_TARGET),wii)
+EXEEXT=.dol
+SHAREDLIBEXT=.so
+SHORTSUFFIX=wii
+endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -2079,6 +2128,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2162,6 +2214,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)
+endif
+endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE)
@@ -2179,6 +2240,9 @@ endif
 ifdef UNITDIR_RTL
 override COMPILER_UNITDIR+=$(UNITDIR_RTL)
 endif
+ifdef UNITDIR_FPMAKE_RTL
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
+endif
 endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
@@ -2668,6 +2732,7 @@ fpc_baseinfo:
 	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)  SourceSuffix. $(SOURCESUFFIX)
 	@$(ECHO)  TargetSuffix. $(TARGETSUFFIX)
+	@$(ECHO)  FPC fpmake... $(FPCFPMAKE)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/fcl-process/Makefile.fpc

@@ -7,20 +7,20 @@ name=fcl-process
 version=2.5.1
 
 [target]
-units=pipes process
-units_beos=simpleipc dbugmsg dbugintf
-units_haiku=simpleipc dbugmsg dbugintf
-units_freebsd=simpleipc dbugmsg dbugintf
-units_darwin=simpleipc dbugmsg dbugintf
-units_iphonesim=simpleipc dbugmsg dbugintf
-units_solaris=simpleipc dbugmsg dbugintf
-units_netbsd=simpleipc dbugmsg dbugintf
-units_openbsd=simpleipc dbugmsg dbugintf
-units_linux=simpleipc dbugmsg dbugintf
+units=pipes process 
+units_beos=simpleipc dbugmsg dbugintf pipesipc
+units_haiku=simpleipc dbugmsg dbugintf pipesipc 
+units_freebsd=simpleipc dbugmsg dbugintf pipesipc
+units_darwin=simpleipc dbugmsg dbugintf pipesipc
+units_iphonesim=simpleipc dbugmsg dbugintf pipesipc
+units_solaris=simpleipc dbugmsg dbugintf pipesipc
+units_netbsd=simpleipc dbugmsg dbugintf pipesipc
+units_openbsd=simpleipc dbugmsg dbugintf pipesipc
+units_linux=simpleipc dbugmsg dbugintf pipesipc
 units_win32=simpleipc dbugmsg dbugintf
 units_win64=simpleipc dbugmsg dbugintf
 units_wince=simpleipc dbugmsg dbugintf
-units_qnx=simpleipc dbugmsg dbugintf
+units_qnx=simpleipc dbugmsg dbugintf pipesipc
 units_os2=simpleipc dbugmsg dbugintf
 units_emx=simpleipc dbugmsg dbugintf
 rsts=process simpleipc

packages/fcl-process/src/pipesipc.pp

@@ -0,0 +1,18 @@
+{
+    This file is part of the Free Component library.
+    Copyright (c) 2005 by Michael Van Canneyt, member of
+    the Free Pascal development team
+
+    Unix pipe implementation of one-way IPC between 2 processes
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$define ipcunit}
+{$i simpleipc.inc}

packages/fcl-process/src/simpleipc.pp

@@ -48,6 +48,9 @@ Type
     FOwner  : TSimpleIPCServer;
   Protected  
     Function  GetInstanceID : String; virtual; abstract;
+    Procedure DoError(Msg : String; Args : Array of const);
+    Procedure SetMsgType(AMsgType: TMessageType); 
+    Function MsgData : TStream;
   Public
     Constructor Create(AOwner : TSimpleIPCServer); virtual;
     Property Owner : TSimpleIPCServer read FOwner;
@@ -117,6 +120,8 @@ Type
   TIPCClientComm = Class(TObject)
   private
     FOwner: TSimpleIPCClient;
+  protected
+   Procedure DoError(Msg : String; Args : Array of const);
   Public
     Constructor Create(AOwner : TSimpleIPCClient); virtual;
     Property  Owner : TSimpleIPCClient read FOwner;
@@ -185,6 +190,24 @@ begin
   FOwner:=AOWner;
 end;
 
+Procedure TIPCServerComm.DoError(Msg : String; Args : Array of const);
+
+begin
+  FOwner.DoError(Msg,Args);
+end;  
+
+Function TIPCServerComm.MsgData : TStream;
+
+begin
+  Result:=FOwner.FMsgData;
+end;
+
+Procedure TIPCServerComm.SetMsgType(AMsgType: TMessageType); 
+
+begin
+  Fowner.FMsgType:=AMsgType;
+end;
+
 { ---------------------------------------------------------------------
     TIPCClientComm
   ---------------------------------------------------------------------}
@@ -194,6 +217,12 @@ begin
   FOwner:=AOwner;
 end;
 
+Procedure TIPCClientComm.DoError(Msg : String; Args : Array of const);
+
+begin
+  FOwner.DoError(Msg,Args);
+end;  
+
 { ---------------------------------------------------------------------
     TSimpleIPC
   ---------------------------------------------------------------------}

packages/fcl-process/src/unix/simpleipc.inc

@@ -14,8 +14,21 @@
 
  **********************************************************************}
 
+{$ifdef ipcunit}
+unit pipesipc;
+
+interface
+
+uses sysutils, classes, simpleipc, baseunix;
+
+{$else}
+
 uses baseunix;
 
+{$endif}
+
+
+
 ResourceString
   SErrFailedToCreatePipe = 'Failed to create named pipe: %s';
   SErrFailedToRemovePipe = 'Failed to remove named pipe: %s';
@@ -39,6 +52,11 @@ Type
     Property Stream : TFileStream Read FStream;
   end;
 
+{$ifdef ipcunit}
+implementation
+{$endif}
+
+
 
 constructor TPipeClientComm.Create(AOWner: TSimpleIPCClient);
 
@@ -58,7 +76,7 @@ end;
 procedure TPipeClientComm.Connect;
 begin
   If Not ServerRunning then
-    Owner.DoError(SErrServerNotActive,[Owner.ServerID]);
+    DoError(SErrServerNotActive,[Owner.ServerID]);
   // Use the sharedenynone line to allow more then one client 
   // communicating with one server at the same time
   // see also mantis 15219
@@ -130,7 +148,7 @@ procedure TPipeServerComm.StartServer;
 begin
   If not FileExists(FFileName) then
     If (fpmkFifo(FFileName,438)<>0) then
-      Owner.DoError(SErrFailedToCreatePipe,[FFileName]);
+      DoError(SErrFailedToCreatePipe,[FFileName]);
   FStream:=TFileStream.Create(FFileName,fmOpenReadWrite+fmShareDenyNone);
 end;
 
@@ -138,7 +156,7 @@ procedure TPipeServerComm.StopServer;
 begin
   FreeAndNil(FStream);
   if Not DeleteFile(FFileName) then
-    Owner.DoError(SErrFailedtoRemovePipe,[FFileName]);
+    DoError(SErrFailedtoRemovePipe,[FFileName]);
 end;
 
 function TPipeServerComm.PeekMessage(TimeOut: Integer): Boolean;
@@ -157,18 +175,19 @@ procedure TPipeServerComm.ReadMessage;
 Var
   L,P,Count : Integer;
   Hdr : TMsgHeader;
-
+  M : TStream;
 begin
   FStream.ReadBuffer(Hdr,SizeOf(Hdr));
-  Owner.FMsgType:=Hdr.MsgType;
+  SetMsgType(Hdr.MsgType);
   Count:=Hdr.MsgLen;
+  M:=MsgData;
   if count > 0 then
     begin
-    Owner.FMsgData.Seek(0,soFrombeginning);
-    Owner.FMsgData.CopyFrom(FStream,Count);
+    M.Seek(0,soFrombeginning);
+    M.CopyFrom(FStream,Count);
     end
   else
-    Owner.FMsgData.Size := 0;
+    M.Size := 0;
 end;
 
 function TPipeServerComm.GetInstanceID: String;
@@ -179,7 +198,7 @@ end;
 { ---------------------------------------------------------------------
     Set TSimpleIPCClient / TSimpleIPCServer defaults.
   ---------------------------------------------------------------------}
-
+{$ifndef ipcunit}
 Function TSimpleIPCServer.CommClass : TIPCServerCommClass;
 
 begin
@@ -196,3 +215,7 @@ begin
   else
     Result:=TPipeClientComm;
 end;
+
+{$else ipcunit}
+end.
+{$endif}