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:
@ -24,6 +24,7 @@
|
||||
#include "nserver.h"
|
||||
#include "servlog.h"
|
||||
#include "sicsglobal.h"
|
||||
extern void KeepStartupCommands(); /* ofac.c */
|
||||
|
||||
/* ========================= Less dreadful file statics =================== */
|
||||
|
||||
@ -60,6 +61,8 @@ int main(int argc, char *argv[])
|
||||
if (argv[i][0] == '-') {
|
||||
if (strcasecmp(argv[i], "-nolog") == 0) {
|
||||
SICSLogEnable(0);
|
||||
}else if(strcmp(argv[i],"-keepstartup") == 0){
|
||||
KeepStartupCommands();
|
||||
#ifdef SITE_ANSTO
|
||||
} else if (strcasecmp(argv[i], "-v") == 0) {
|
||||
extern void SiteReportVersion(void);
|
||||
|
Reference in New Issue
Block a user