epicsStdioRedirect

src/as/asCa.c

@@ -30,7 +30,7 @@
 #include "caerr.h"
 #include "caeventmask.h"
 #include "alarm.h"
-#include "epicsStdio.h"
+#include "epicsStdioRedirect.h"
 
 #include "epicsExport.h"
 #include "asLib.h"

src/as/asDbLib.c

@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "epicsStdio.h"
+#include "epicsStdioRedirect.h"
 #include "dbDefs.h"
 #include "cantProceed.h"
 #include "epicsThread.h"

src/as/asLibRoutines.c

@@ -16,6 +16,7 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "epicsStdioRedirect.h"
 #include "dbDefs.h"
 #include "epicsThread.h"
 #include "ellLib.h"
@@ -281,7 +282,7 @@ long epicsShareAPI asRemoveMember(ASMEMBERPVT *asMemberPvt)
     } else {
 	errMessage(-1,"Logic error in asRemoveMember");
 	UNLOCK;
-	exit(-1);
+	return(-1);
     }
     free((void *)pasgmember);
     *asMemberPvt = NULL;
@@ -303,7 +304,7 @@ long epicsShareAPI asChangeGroup(ASMEMBERPVT *asMemberPvt,const char *newAsgName
     } else {
 	errMessage(-1,"Logic error in asChangeGroup");
 	UNLOCK;
-	exit(-1);
+	return(-1);
     }
     status = asAddMemberPvt(asMemberPvt,newAsgName);
     UNLOCK;
@@ -868,7 +869,7 @@ static long asAddMemberPvt(ASMEMBERPVT *pasMemberPvt,const char *asgName)
 	pgroup = (ASG *)ellNext((ELLNODE *)pgroup);
     }
     errMessage(-1,"Logic Error in asAddMember");
-    exit(1);
+    return(-1);
 got_it:
     pasgmember->pasg = pgroup;
     ellAdd(&pgroup->memberList,(ELLNODE *)pasgmember);

src/as/asTrapWrite.c

@@ -22,6 +22,7 @@
 
 #include "ellLib.h"
 #include "freeList.h"
+#include "epicsStdioRedirect.h"
 #include "cantProceed.h"
 #include "epicsMutex.h"
 #include "ellLib.h"

src/as/ascheck.c

@@ -29,7 +29,7 @@ int main(int argc,char **argv)
     char	**pstr;
     char	*psep;
     int		*len;
-    long	status;
+    long	status = 0;
     static char *subSep = ",";
 
     /*Look for options*/
@@ -49,9 +49,10 @@ int main(int argc,char **argv)
     }
     if(argc!=1) {
 	printf("usage: ascheck -Smacsub < file\n");
-	exit(0);
+        status = -1;
+    } else {
+        status = asInitFP(stdin,sub);
+        if(status) errMessage(status,"from asInitFP");
     }
-    status = asInitFP(stdin,sub);
-    if(status) errMessage(status,"from asInitFP");
-    return(0);
+    return(status);
 }

src/db/dbCaTest.c

@@ -22,6 +22,7 @@
 #include <errno.h>
 
 #include "dbStaticLib.h"
+#include "epicsStdioRedirect.h"
 #include "link.h"
 /*definitions needed because of old vs new database access*/
 #undef DBR_SHORT

src/db/dbLock.c

@@ -47,6 +47,7 @@ since this will delay all other threads.
 #include <stdio.h>
 #include <string.h>
 
+#include "epicsStdioRedirect.h"
 #include "dbDefs.h"
 #include "dbBase.h"
 #include "epicsMutex.h"

src/db/dbScan.c

@@ -22,6 +22,7 @@
 #include <limits.h>
 #include <math.h>
 
+#include "epicsStdioRedirect.h"
 #include "dbDefs.h"
 #include "ellLib.h"
 #include "taskwd.h"

src/db/dbTest.c

@@ -21,6 +21,7 @@
 #include "errlog.h"
 #include "ellLib.h"
 #include "epicsMutex.h"
+#include "epicsStdioRedirect.h"
 #include "ellLib.h"
 #include "dbBase.h"
 #include "dbStaticLib.h"

src/db/db_test.c

@@ -21,6 +21,7 @@
 #include "dbDefs.h"
 #include "errlog.h"
 #include "cadef.h"
+#include "epicsStdioRedirect.h"
 #define epicsExportSharedSymbols
 #include "db_access_routines.h"
 #include "dbNotify.h"

src/dbStatic/dbStaticLib.c

@@ -32,7 +32,7 @@
 #include "dbmf.h"
 #include "postfix.h"
 #include "osiFileName.h"
-#include "epicsStdio.h"
+#include "epicsStdioRedirect.h"
 
 #define epicsExportSharedSymbols
 #include "link.h"
@@ -1729,7 +1729,7 @@ long epicsShareAPI dbCopyRecord(DBENTRY *pdbentry,const char *newRecordName,int
 	if(!status) status = dbNextField(&dbentry,TRUE);
 	if(!status && (pdbentry->pflddes!=dbentry.pflddes)) {
 	    epicsPrintf("dbCopyRecord: Logic Error\n");
-	    exit(1);
+	    return(-1);
 	}
     }
     /*Copy the info strings too*/

src/misc/epicsRelease.c

@@ -13,6 +13,7 @@
 #include    <stdlib.h>
 #include    <stdio.h>
 #include    "epicsVersion.h"
+#include    "epicsStdioRedirect.h"
 
 #define epicsExportSharedSymbols
 #include    "epicsRelease.h"

src/rsrv/caservertask.c

@@ -38,6 +38,7 @@
 #include "dbAddr.h"
 #include "dbEvent.h"
 #include "dbCommon.h"
+#include "epicsStdioRedirect.h"
 
 #define epicsExportSharedSymbols
 #include "rsrv.h"