From 164449f0d6900dd320353bd37fa7cc63b4052b13 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 18 May 2004 19:22:38 +0000
Subject: [PATCH] Remove startCaRepeater - no longer works, use caRepeater from
 src/ca. Tidy up rc2 stuff.

---
 src/util/Makefile          |  3 +--
 src/util/rc2.caRepeater    | 30 ++++++++++--------------------
 src/util/startCArepeater.c | 35 -----------------------------------
 3 files changed, 11 insertions(+), 57 deletions(-)
 delete mode 100644 src/util/startCArepeater.c

diff --git a/src/util/Makefile b/src/util/Makefile
index 409334e4d..e1062961a 100644
--- a/src/util/Makefile
+++ b/src/util/Makefile
@@ -16,7 +16,7 @@ PROD_LIBS  = ca Com
 #
 # Added winmm user32 for the non-dll build
 #
-PROD_HOST_DEFAULT = ca_test iocLogServer startCArepeater 
+PROD_HOST_DEFAULT = ca_test iocLogServer
 PROD_HOST_WIN32   = ca_test iocLogServer
 PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
 
@@ -24,7 +24,6 @@ iocLogServer_SYS_LIBS_solaris = socket
 
 ca_test_SRCS = ca_test_main.c ca_test.c
 iocLogServer_SRCS = iocLogServer.c
-startCArepeater_SRCS = startCArepeater.c
 
 OBJS_vxWorks = ca_test
 
diff --git a/src/util/rc2.caRepeater b/src/util/rc2.caRepeater
index 7474e0f43..7611e8aad 100644
--- a/src/util/rc2.caRepeater
+++ b/src/util/rc2.caRepeater
@@ -1,40 +1,30 @@
 #!/bin/sh
 #
-# Solaris rc2 script for the EPICS CA Repeater.
+# System-V init script for the EPICS CA Repeater.
 #
 
 INSTALL_BIN=:INSTALL_BIN:
 EPICS=:EPICS:
 
-# To change the default values for the EPICS Environment parameters,
-# uncomment and modify the relevant lines below.
+# To change the default values for the EPICS environment parameters,
+# uncomment and modify the relevant lines below. These are the only
+# environment variables that the CA Repeater makes use of.
 
-# EPICS_CA_ADDR_LIST=""
-# EPICS_CA_CONN_TMO="30.0"
-# EPICS_CA_BEACON_PERIOD="15.0"
-# EPICS_CA_AUTO_ADDR_LIST="YES"
-# EPICS_CA_REPEATER_PORT="5065"
-# EPICS_CA_SERVER_PORT="5064"
-# export EPICS_CA_ADDR_LIST
-# export EPICS_CA_CONN_TMO
-# export EPICS_CA_BEACON_PERIOD
-# export EPICS_CA_AUTO_ADDR_LIST
-# export EPICS_CA_REPEATER_PORT
-# export EPICS_CA_SERVER_PORT
+# EPICS_CA_REPEATER_PORT="5065" export EPICS_CA_REPEATER_PORT
 
 if [ $1 = "start" ]; then
-	if [ -x $INSTALL_BIN/startCArepeater ]; then
+	if [ -x $INSTALL_BIN/caRepeater ]; then
 		echo "Starting EPICS CA repeater "
 		PATH=$INSTALL_BIN:$PATH: export PATH
-		$INSTALL_BIN/startCArepeater
+		$INSTALL_BIN/caRepeater &
         fi
 else
         if [ $1 = "stop" ]; then
-                pid=`/usr/bin/ps -e | /usr/bin/grep caRepeat | /usr/bin/sed -e 's/^  *//' -e 's/ .*//'`   
+                pid=`ps -e | sed -ne '/caRepeat/s/^ *\([1-9][0-9]*\).*$/\1/p'`
                 if [ "${pid}" != "" ]; then
                         echo "Stopping EPICS CA Repeater "
-                        /usr/bin/kill ${pid}
-                fi     
+                        kill ${pid}
+                fi
         fi
 fi
 
diff --git a/src/util/startCArepeater.c b/src/util/startCArepeater.c
deleted file mode 100644
index 8e93cc124..000000000
--- a/src/util/startCArepeater.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     National Laboratory.
-* Copyright (c) 2002 The Regents of the University of California, as
-*     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
-\*************************************************************************/
-/*	$Id$
- *	Author:	Roger A. Cole
- *	Date:	05-03-91
- */
-/*+/mod***********************************************************************
-* TITLE	startCArepeater.c - start up the Channel Access repeater task
-*
-* DESCRIPTION
-*	This program exists to avoid having the UNIX Channel Access
-*	repeater process masquerade as the process which caused it to
-*	be created.  For example, if AR is the first Channel Access client
-*	started after booting the workstation, then there will exist the
-*	"real" AR process as well as the CA repeater process whose name
-*	would also be "AR", since it is produced via a fork.
-*
-*	To avoid this problem, the script which starts AR first runs this
-*	program.  Other programs which care could adopt the same strategy.
-*
-*-***************************************************************************/
-#include <stdio.h>
-#include <cadef.h>
-int main()
-{
-    ca_task_initialize();
-    return 0;
-}