/*
* base code for various Tcl extensions
- * Copyright 2006 Ian Jackson
+ * Copyright 2006-2012 Ian Jackson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "chiark-tcl-base.h"
va_list al;
char *p;
const char *part;
- int l, pl;
+ int l;
+ size_t pl;
va_start(al,o);
- for (l=0; (part= va_arg(al, const char*)); )
- l+= va_arg(al, int);
+ for (l=0; (part= va_arg(al, const char*)); ) {
+ pl= va_arg(al, size_t);
+ assert(pl <= INT_MAX/2 - l);
+ l += pl;
+ }
va_end(al);
o->length= l;
va_start(al,o);
for (p= o->bytes; (part= va_arg(al, const char*)); p += pl) {
- pl= va_arg(al, int);
+ pl= va_arg(al, size_t);
memcpy(p, part, pl);
}
va_end(al);
int cht_get_urandom(Tcl_Interp *ip, Byte *buffer, int l) {
static FILE *urandom;
- int r, esave;
+ int r;
if (!urandom) {
urandom= fopen(URANDOM,"rb");
r= fread(buffer,1,l,urandom);
if (r==l) return 0;
- esave= errno;
- fclose(urandom); urandom=0;
-
if (ferror(urandom)) {
- return cht_posixerr(ip,errno,"read " URANDOM);
+ r = cht_posixerr(ip,errno,"read " URANDOM);
} else {
assert(feof(urandom));
- return cht_staticerr(ip, URANDOM " gave eof!", 0);
+ r = cht_staticerr(ip, URANDOM " gave eof!", 0);
}
+ fclose(urandom); urandom=0;
+ return r;
}
-int cht_initextension(Tcl_Interp *ip, const TopLevel_Command *cmds,
- int *donep /* or 0, meaning no types follow */,
- ... /* types, terminated by 0 */) {
- static int cht_initd;
-
- const TopLevel_Command *cmd;
- Tcl_ObjType *ot;
-
- va_list al;
+void cht_prepare__basic(Tcl_Interp *ip) {
+ static int prepared;
- if (!cht_initd) {
- cht_initd= 1;
- Tcl_RegisterObjType(&cht_tabledataid_nearlytype);
- Tcl_RegisterObjType(&cht_enum_nearlytype);
- Tcl_RegisterObjType(&cht_enum1_nearlytype);
- }
-
- if (donep && !*donep) {
- *donep= 1;
- va_start(al, donep);
- while ((ot= va_arg(al, Tcl_ObjType*)))
- Tcl_RegisterObjType(ot);
- }
+ if (prepared) return;
+ Tcl_RegisterObjType(&cht_tabledataid_nearlytype);
+ Tcl_RegisterObjType(&cht_enum_nearlytype);
+ Tcl_RegisterObjType(&cht_enum1_nearlytype);
+ prepared= 1;
+}
+void cht_setup__commands(Tcl_Interp *ip, const TopLevel_Command *cmds) {
+ const TopLevel_Command *cmd;
+
for (cmd= cmds;
cmd->name;
cmd++)
Tcl_CreateObjCommand(ip, (char*)cmd->name, cmd->func, 0,0);
-
- return TCL_OK;
}