fixes for cdb; it now works at least a bit

[chiark-tcl.git] / base / scriptinv.c

diff --git a/base/scriptinv.c b/base/scriptinv.c
index 644459a0f0ec8ebd261ea39c10d399df2509dcc3..a066572c2873ecc3edff403574c8f6cc2a89f350 100644 (file)
--- a/base/scriptinv.c
+++ b/base/scriptinv.c
@@ -4,13 +4,15 @@
 #include "chiark-tcl-base.h"
 
 void cht_scriptinv_init(ScriptToInvoke *si) {
-  si->obj= 0;
+  si->ipq= 0;
+  si->script= 0;
   si->xargs= 0;
 }
 
 void cht_scriptinv_cancel(ScriptToInvoke *si) {
-  if (si->obj) { Tcl_DecrRefCount(si->obj); si->obj= 0; }
+  if (si->script) { Tcl_DecrRefCount(si->script); si->script= 0; }
   if (si->xargs) { Tcl_DecrRefCount(si->xargs); si->xargs= 0; }
+  si->ipq= 0;
 }
 
 int cht_scriptinv_set(ScriptToInvoke *si, Tcl_Interp *ip,
@@ -18,19 +20,20 @@ int cht_scriptinv_set(ScriptToInvoke *si, Tcl_Interp *ip,
   int rc, xlength;
   
   cht_scriptinv_cancel(si);
+  if (!newscript) return 0;
 
-  rc= Tcl_ListObjLength(ip, newscript, &si->llength);  if (rc) return rc;
+  rc= Tcl_ListObjLength(ip, newscript, &si->llen);  if (rc) return rc;
   Tcl_IncrRefCount(newscript);
 
   if (xargs) {
     rc= Tcl_ListObjLength(ip, xargs, &xlength);  if (rc) return rc;
     Tcl_IncrRefCount(xargs);
-    si->llength += xlength;
+    si->llen += xlength;
   }
 
-  si->obj= newscript;
+  si->script= newscript;
   si->xargs= xargs;
-  si->ip= ip;
+  si->ipq= ip;
   return 0;
 }  
   
@@ -39,21 +42,22 @@ int cht_scriptinv_invoke_fg(ScriptToInvoke *si, int argc,
   Tcl_Obj *invoke=0;
   int i, rc;
 
-  assert(si->obj);
+  if (!si->ipq) return TCL_OK;
+
   for (i=0; i<argc; i++) Tcl_IncrRefCount(argv[i]);
 
-  invoke= Tcl_DuplicateObj(si->obj);
+  invoke= Tcl_DuplicateObj(si->script);
   Tcl_IncrRefCount(invoke);
 
   if (si->xargs) {
-    rc= Tcl_ListObjAppendList(si->ip, invoke, si->xargs);
+    rc= Tcl_ListObjAppendList(si->ipq, invoke, si->xargs);
     if (rc) goto x_rc;
   }
 
-  rc= Tcl_ListObjReplace(si->ip, invoke,si->llength,0, argc,argv);
+  rc= Tcl_ListObjReplace(si->ipq, invoke,si->llen,0, argc,argv);
   if (rc) goto x_rc;
 
-  rc= Tcl_EvalObjEx(si->ip,invoke,TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
+  rc= Tcl_EvalObjEx(si->ipq, invoke, TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
   if (rc) goto x_rc;
 
   rc= 0;
@@ -67,5 +71,5 @@ x_rc:
 void cht_scriptinv_invoke(ScriptToInvoke *si, int argc, Tcl_Obj *const *argv) {
   int rc;
   rc= cht_scriptinv_invoke_fg(si, argc, argv);
-  if (rc) Tcl_BackgroundError(si->ip);
+  if (rc) Tcl_BackgroundError(si->ipq);
 }