Update of /cvsroot/pure-data/externals/miXed/shared/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9512/shared/toxy
Modified Files: scriptlet.c Log Message: scriptlet bugs: qpush and params
Index: scriptlet.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/shared/toxy/scriptlet.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** scriptlet.c 25 Feb 2004 10:54:42 -0000 1.4 --- scriptlet.c 29 Feb 2004 17:16:44 -0000 1.5 *************** *** 23,27 **** #define SCRIPTLET_MARGIN 64 #define SCRIPTLET_MAXARGS 9 /* do not increase (parser's constraint) */ ! #define SCRIPTLET_MAXPUSH 20000 /* Tcl limit? LATER investigate */
enum { SCRIPTLET_CVOK, SCRIPTLET_CVUNKNOWN, SCRIPTLET_CVMISSING }; --- 23,27 ---- #define SCRIPTLET_MARGIN 64 #define SCRIPTLET_MAXARGS 9 /* do not increase (parser's constraint) */ ! #define SCRIPTLET_MAXPUSH 20000 /* cf SOCKSIZE in t_tkcmd.c, LATER revisit */
enum { SCRIPTLET_CVOK, SCRIPTLET_CVUNKNOWN, SCRIPTLET_CVMISSING }; *************** *** 145,164 **** else if (argprops) { ! char *ptr; int cnt; ! for (ptr = ibuf + 1, cnt = 1; *ptr; ptr++, cnt++) { - char c = *ptr; if ((c < 'A' || c > 'Z') && (c < 'a' || c > 'z')) { ! cnt = 0; break; } } ! if (cnt && (ptr = props_getvalue(argprops, ibuf + 1))) { ! strcpy(obuf, ptr); len = cnt; } } } --- 145,165 ---- else if (argprops) { ! char *iptr, *optr, c; int cnt; ! for (iptr = ibuf + 1, c = *iptr, cnt = 1; c; ! iptr++, c = *iptr, cnt++) { if ((c < 'A' || c > 'Z') && (c < 'a' || c > 'z')) { ! *iptr = 0; break; } } ! if (optr = props_getvalue(argprops, ibuf + 1)) { ! strcpy(obuf, optr); len = cnt; } + if (c) *iptr = c; } } *************** *** 425,430 **** sys_gui(sp->s_buffer); *tail = 0; ! sprintf(buf, "after 0 {::toxy::query}\nvwait ::toxy::reply\n\ ! pd [concat %s _rp $::toxy::reply \;]\n", sp->s_rptarget->s_name); sys_gui(buf); } --- 426,432 ---- sys_gui(sp->s_buffer); *tail = 0; ! /* LATER find out if reply does not fit better inside the query proc */ ! sprintf(buf, "after 0 {::toxy::query\n\ ! pd [concat %s _rp $::toxy::reply \;]}\n", sp->s_rptarget->s_name); sys_gui(buf); }