}
}
-int scriptinv_set(ScriptToInvoke *si, Tcl_Interp *ip, Tcl_Obj *newscript) {
+int scriptinv_set(ScriptToInvoke *si, Tcl_Interp *ip,
+ Tcl_Obj *newscript, Tcl_Obj *xargs) {
int rc;
scriptinv_cancel(si);
- rc= Tcl_ListObjLength(ip, newscript, &si->llength);
- if (rc) return rc;
-
+ rc= Tcl_ListObjLength(ip, newscript, &si->llength); if (rc) return rc;
Tcl_IncrRefCount(newscript);
+
+ if (xargs) {
+ rc= Tcl_ListObjLength(ip, xargs, &si->llength); if (rc) return rc;
+ Tcl_IncrRefCount(xargs);
+ }
+
si->obj= newscript;
+ si->xargs= xargs;
si->ip= ip;
return 0;
}
invoke= Tcl_DuplicateObj(si->obj);
Tcl_IncrRefCount(invoke);
- rc= Tcl_ListObjReplace(si->ip,invoke,si->llength,0,argc,argv);
+ if (si->xargs) {
+ rc= Tcl_ListObjAppendList(si->ip, invoke, si->xargs);
+ if (rc) goto x_rc;
+ }
+
+ rc= Tcl_ListObjReplace(si->ip, invoke,si->llength,0, argc,argv);
for (i=0; i<argc; i++) { Tcl_DecrRefCount(argv[i]); argv[i]= 0; }
if (rc) goto x_rc;