Cleaned up ANSTO code to merge with sinqdev.sics

This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c
Conflicts:
	.gitignore
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	event.h
	exebuf.c
	exeman.c
	histmem.c
	interface.h
	motor.c
	motorlist.c
	motorsec.c
	multicounter.c
	napi.c
	napi.h
	napi4.c
	network.c
	nwatch.c
	nxscript.c
	nxxml.c
	nxxml.h
	ofac.c
	reflist.c
	scan.c
	sicshipadaba.c
	sicsobj.c
	site_ansto/docs/Copyright.txt
	site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl
	site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl
	statusfile.c
	tasdrive.c
	tasub.c
	tasub.h
	tasublib.c
	tasublib.h

nread.c

@@ -1108,6 +1108,7 @@ static int CommandAcceptCB(int handle, void *userData)
 {
   SConnection *pCon = NULL;
   pCommandCBData usData = NULL;
+  char buffer[80];
 
   pCon = SCreateConnection(pServ->pSics, handle, 3);
   usData = malloc(sizeof(CommandCBData));
@@ -1122,7 +1123,9 @@ static int CommandAcceptCB(int handle, void *userData)
   }
   usData->pCon = pCon;
   usData->state = COLLECT;
-  TaskRegister(pServ->pTasker,
+  snprintf(buffer,sizeof(buffer),"con%ld", pCon->ident);
+  TaskRegisterN(pServ->pTasker,
+	       buffer,
                SCTaskFunction,
                SCSignalFunction, SCDeleteConnection, pCon, 1);
   ANETsetReadCallback(handle, CommandDataCB, usData, killCommandCBData);
@@ -1313,6 +1316,7 @@ static int TelnetAcceptCB(int handle, void *userData)
   SConnection *pCon = NULL;
   pCommandCBData usData = NULL;
   pTelTask pTel = NULL;
+  char buffer[80];
 
   pCon = SCreateConnection(pServ->pSics, handle, 3);
   usData = malloc(sizeof(CommandCBData));
@@ -1336,7 +1340,9 @@ static int TelnetAcceptCB(int handle, void *userData)
   }
   /* register connection and task */
   pCon->iTelnet = 1;
-  TaskRegister(pServ->pTasker,
+  snprintf(buffer,sizeof(buffer),"con%ld", pCon->ident);
+  TaskRegisterN(pServ->pTasker,
+		buffer,
                TelnetTask, TelnetSignal, DeleteTelnet, pTel, 1);
   ANETsetReadCallback(handle, ANETTelnetProcess,
                       usData, killCommandCBData);