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
This commit is contained in:
15
exeman.c
15
exeman.c
@@ -224,7 +224,16 @@ pDynString findBatchFile(SicsInterp * pSics, char *name)
|
||||
}
|
||||
return locateBatchBuffer(self, name);
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------*/
|
||||
int isBatchRunning()
|
||||
{
|
||||
pExeMan self = (pExeMan) FindCommandData(pServ->pSics, "exe", "ExeManager");
|
||||
if(self != NULL && self->exeStackPtr > 0){
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
/*--------------------------------------------------------------------*/
|
||||
static int runBatchBuffer(pExeMan self, SConnection * pCon,
|
||||
SicsInterp * pSics, char *name)
|
||||
@@ -1175,7 +1184,9 @@ static int printBuffer(pExeMan self, SConnection * pCon,
|
||||
}
|
||||
while (fgets(pLine, 511, fd) != NULL) {
|
||||
DynStringConcat(filePath, pLine);
|
||||
DynStringConcatChar(filePath,'\n');
|
||||
if(strrchr(pLine,(int)'\n') == NULL){
|
||||
DynStringConcatChar(filePath,'\n');
|
||||
}
|
||||
}
|
||||
fclose(fd);
|
||||
SCWrite(pCon, GetCharArray(filePath), eValue);
|
||||
|
||||
Reference in New Issue
Block a user