- Fixes to make SL6 work
- New NeXus libraries - Added new raw binary transfer mode for mass data - Added a check script option to configurable virtual motor SKIPPED: psi/dumprot.c psi/make_gen psi/psi.c psi/rebin.c psi/sanslirebin.c
This commit is contained in:
22
macro.c
22
macro.c
@@ -119,6 +119,12 @@ int MacroPop(void)
|
||||
return 1;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
SConnection *MacroPeek(void)
|
||||
{
|
||||
assert(pUnbekannt);
|
||||
return pUnbekannt->pCon[pUnbekannt->iStack];
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static int SicsUnknownProc(ClientData pData, Tcl_Interp * pInter,
|
||||
int argc, char *argv[])
|
||||
{
|
||||
@@ -269,11 +275,10 @@ static void KillExec(ClientData data)
|
||||
}
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------------
|
||||
This is in the Tcl sources
|
||||
*/
|
||||
extern int Tcl_ExecObjCmd(ClientData data, Tcl_Interp * interp,
|
||||
int objc, Tcl_Obj * CONST objv[]);
|
||||
/*-----------------------------------------------------------------------*/
|
||||
/* static Tcl_ObjCmdProc oldExec = NULL; */
|
||||
static int (*oldExec)(ClientData clientData,Tcl_Interp *interp,
|
||||
int objc,Tcl_Obj *const objv[] ) = NULL;
|
||||
/*-----------------------------------------------------------------------*/
|
||||
static int ProtectedExec(ClientData clientData, Tcl_Interp * interp,
|
||||
int objc, Tcl_Obj * CONST objv[])
|
||||
@@ -281,13 +286,13 @@ static int ProtectedExec(ClientData clientData, Tcl_Interp * interp,
|
||||
char *test = NULL;
|
||||
|
||||
if (objc < 2) {
|
||||
return Tcl_ExecObjCmd(clientData, interp, objc, objv);
|
||||
return oldExec(clientData, interp, objc, objv);
|
||||
}
|
||||
|
||||
test = Tcl_GetStringFromObj(objv[1], NULL);
|
||||
if (allowedCommands != NULL) {
|
||||
if (StringDictExists(allowedCommands, test)) {
|
||||
return Tcl_ExecObjCmd(clientData, interp, objc, objv);
|
||||
return oldExec(clientData, interp, objc, objv);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -313,6 +318,7 @@ Tcl_Interp *MacroInit(SicsInterp * pSics)
|
||||
FILE *fp = NULL;
|
||||
char pBueffel[512];
|
||||
int iRet;
|
||||
Tcl_CmdInfo execInfo;
|
||||
|
||||
assert(pSics);
|
||||
|
||||
@@ -338,6 +344,8 @@ Tcl_Interp *MacroInit(SicsInterp * pSics)
|
||||
Tcl_DeleteCommand(pInter, "exit");
|
||||
Tcl_DeleteCommand(pInter, "socket");
|
||||
Tcl_DeleteCommand(pInter, "vwait");
|
||||
Tcl_GetCommandInfo(pInter,"exec",&execInfo);
|
||||
oldExec = execInfo.objProc;
|
||||
Tcl_DeleteCommand(pInter, "exec");
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user