Ticket #5570: expect-5.45.4-tcl9-DRAFT.patch

Dbg.c

@@ -362 +362 @@
         static char buf_basic[DEFAULT_WIDTH+1]; /* basic buffer */
         static char *buf = buf_basic;
         int space;              /* space remaining in buf */
-        int len;
+        Tcl_Size len;
         char *bufp;
         int proc;               /* if current command is "proc" */
         int arg_index;
@@ -398 +398 @@
 #if TCL_MAJOR_VERSION >= 8
                                               -1,
 #endif
-                                &elementPtr,&nextPtr,(int *)0,(int *)0);
+                                &elementPtr,&nextPtr,NULL,NULL);
                         if (*elementPtr == '\0') wrap = TRUE;
                         else if (*nextPtr == '\0') wrap = FALSE;
                         else wrap = TRUE;
@@ -443 +443 @@
 {
     char **argv;
     int argc;
-    int len;
+    Tcl_Size len;
     argv = (char **)ckalloc(objc+1 * sizeof(char *));
     for (argc=0 ; argc<objc ; argc++) {
         argv[argc] = Tcl_GetStringFromObj(objv[argc],&len);

exp_chan.c

@@ -40 +40 @@
 extern int              expSetBlockModeProc _ANSI_ARGS_((int fd, int mode));
 static int              ExpBlockModeProc _ANSI_ARGS_((ClientData instanceData,
                             int mode));
-static int              ExpCloseProc _ANSI_ARGS_((ClientData instanceData,
-                            Tcl_Interp *interp));
+static int              ExpClose2Proc _ANSI_ARGS_((ClientData instanceData,
+                            Tcl_Interp *interp, int flags));
 static int              ExpInputProc _ANSI_ARGS_((ClientData instanceData,
                             char *buf, int toRead, int *errorCode));
 static int              ExpOutputProc _ANSI_ARGS_((
-                            ClientData instanceData, char *buf, int toWrite,
+                            ClientData instanceData, const char *buf, int toWrite,
                             int *errorCode));
 static void             ExpWatchProc _ANSI_ARGS_((ClientData instanceData,
                             int mask));
@@ -59 +59 @@
  */
 
 Tcl_ChannelType expChannelType = {
-    "exp",                              /* Type name. */
-    TCL_CHANNEL_VERSION_2,
-    ExpCloseProc,                       /* Close proc. */
-    ExpInputProc,                       /* Input proc. */
-    ExpOutputProc,                      /* Output proc. */
-    NULL,                               /* Seek proc. */
-    NULL,                               /* Set option proc. */
-    NULL,                               /* Get option proc. */
-    ExpWatchProc,                       /* Initialize notifier. */
-    ExpGetHandleProc,                   /* Get OS handles out of channel. */
-    NULL,                               /* Close2 proc */
-    ExpBlockModeProc,                   /* Set blocking/nonblocking mode.*/
+    .typeName = "exp",
+    .version = TCL_CHANNEL_VERSION_5,
+    .inputProc = ExpInputProc,
+    .outputProc = ExpOutputProc,
+    .watchProc = ExpWatchProc,
+    .getHandleProc = ExpGetHandleProc,
+    .close2Proc = ExpClose2Proc,
+    .blockModeProc = ExpBlockModeProc,
 };
 
 typedef struct ThreadSpecificData {
@@ -261 +257 @@
 static int
 ExpOutputProc(instanceData, buf, toWrite, errorCodePtr)
     ClientData instanceData;            /* Exp state. */
-    char *buf;                          /* The data buffer. */
+    const char *buf;                            /* The data buffer. */
     int toWrite;                        /* How many bytes to write? */
     int *errorCodePtr;                  /* Where to store error code. */
 {
@@ -312 +308 @@
 
 /*ARGSUSED*/
 static int
-ExpCloseProc(instanceData, interp)
-    ClientData instanceData;    /* Exp state. */
-    Tcl_Interp *interp;         /* For error reporting - unused. */
+ExpClose2Proc(
+    ClientData instanceData,    /* Exp state. */
+    Tcl_Interp *interp,         /* For error reporting - unused. */
+    int flags)
 {
+    if (flags & (TCL_CLOSE_READ | TCL_CLOSE_WRITE))
+        return EINVAL;
+
     ExpState *esPtr = (ExpState *) instanceData;
     ExpState **nextPtrPtr;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -502 +502 @@
 int
 expWriteChars(esPtr,buffer,lenBytes)
      ExpState *esPtr;
-     char *buffer;
+     const char *buffer;
      int lenBytes;
 {
   int rc;

exp_command.c

@@ -191 +191 @@
 {
     static char *user_spawn_id = "exp0";
 
-    char *name = exp_get_var(interp,SPAWN_ID_VARNAME);
+    const char *name = exp_get_var(interp,SPAWN_ID_VARNAME);
     if (!name) name = user_spawn_id;
 
     return expStateFromChannelName(interp,name,opened,adjust,any,SPAWN_ID_VARNAME);
@@ -203 +203 @@
     ExpState *esPtr,
     int open,
     int adjust,
-    char *msg)
+    const char *msg)
 {
     if (open && !esPtr->open) {
         exp_error(interp,"%s: spawn id %s not open",msg,esPtr->name);
@@ -216 +216 @@
 ExpState *
 expStateFromChannelName(
     Tcl_Interp *interp,
-    char *name,
+    const char *name,
     int open,
     int adjust,
     int any,
-    char *msg)
+    const char *msg)
 {
     ExpState *esPtr;
     Tcl_Channel channel;
@@ -284 +284 @@
 }
 
 int
-exp_trap_off(char *name)
+exp_trap_off(const char *name)
 {
 #ifdef HAVE_PTYTRAP
     ExpState *esPtr;
@@ -357 +357 @@
              */
 
             ThreadSpecificData* tsdPtr = TCL_TSD_INIT(&dataKey);
-            char*               cName  = Tcl_GetChannelName(esPtr->chan_orig->channel_orig);
+            const char*         cName  = Tcl_GetChannelName(esPtr->chan_orig->channel_orig);
             Tcl_HashEntry*      entry  = Tcl_FindHashEntry(&tsdPtr->origins,cName);
             ExpOrigin*          orig   = (ExpOrigin*) Tcl_GetHashValue(entry);
 
@@ -575 +575 @@
 Exp_SpawnObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     ExpState *esPtr = 0;
@@ -1370 +1370 @@
 Exp_ExpPidObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     char *chanName = 0;
@@ -1420 +1420 @@
 Exp_GetpidDeprecatedObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     expDiagLog("getpid is deprecated, use pid\r\n");
@@ -1433 +1433 @@
 Exp_SleepObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     double s;
@@ -1491 +1491 @@
 slow_write(
     Tcl_Interp *interp,
     ExpState *esPtr,
-    char *buffer,
+    const char *buffer,
     int rembytes,
     struct slow_arg *arg)
 {
@@ -1499 +1499 @@
 
     while (rembytes > 0) {
         int i, bytelen, charlen;
-        char *p;
+        const char *p;
 
         p = buffer;
         charlen = (arg->size<rembytes?arg->size:rembytes);
@@ -1599 +1599 @@
 human_write(
     Tcl_Interp *interp,
     ExpState *esPtr,
-    char *buffer,
+    const char *buffer,
     struct human_arg *arg)
 {
-    char *sp;
+    const char *sp;
     int size;
     float t;
     float alpha;
@@ -1837 +1837 @@
 {
     struct ExpState *esPtr;
     char *p = i->value;
-    int argc;
-    char **argv;
+    Tcl_Size argc;
+    const char **argv;
     int j;
 
     if (Tcl_SplitList(NULL, p, &argc, &argv) != TCL_OK) goto error;
@@ -1864 +1864 @@
     Tcl_Interp *interp,
     struct exp_i *i)
 {
-    char *p;    /* string representation of list of spawn ids */
+    const char *p;      /* string representation of list of spawn ids */
 
     if (i->direct == EXP_INDIRECT) {
         p = Tcl_GetVar(interp,i->variable,TCL_GLOBAL_ONLY);
@@ -1916 +1916 @@
 Exp_SendLogObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     static char* options[] = { "--", NULL };
@@ -1960 +1960 @@
 Exp_SendObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -1976 +1976 @@
 #define SEND_STYLE_BREAK        0x20
     int send_style = SEND_STYLE_PLAIN;
     int want_cooked = TRUE;
-    char *string;               /* string to send */
-    int len = -1;               /* length of string to send */
+    const char *string;         /* string to send */
+    Tcl_Size len = -1;          /* length of string to send */
     int zeros;          /* count of how many ascii zeros to send */
 
     char *chanName = 0;
@@ -2158 +2158 @@
 Exp_LogFileObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     static char resultbuf[1000];
@@ -2291 +2291 @@
 Exp_LogUserObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     int old_loguser = expLogUserGet();
@@ -2323 +2323 @@
 Exp_DebugObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     int now = FALSE;    /* soon if FALSE, now if TRUE */
@@ -2393 +2393 @@
 Exp_ExpInternalObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     int newChannel = FALSE;
@@ -2473 +2473 @@
 Exp_ExitObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     int value = 0;
@@ -2486 +2486 @@
             objc--;
             objv++;
             if (objc) {
-                int len;
+                Tcl_Size len;
                 char* act = Tcl_GetStringFromObj (objv[0], &len);
 
                 if (exp_onexit_action)
@@ -2529 +2529 @@
 Exp_ConfigureObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])      /* Argument objects. */
 {
     /* Magic configuration stuff. */
@@ -2570 +2570 @@
 Exp_CloseObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])      /* Argument objects. */
 {
     int onexec_flag = FALSE;    /* true if -onexec seen */
@@ -2708 +2708 @@
 Exp_StraceObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     static int trace_level = 0;
@@ -2862 +2862 @@
 Exp_WaitObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     char *chanName = 0;
@@ -3075 +3075 @@
 Exp_ForkObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     int rc;
@@ -3109 +3109 @@
 Exp_DisconnectObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -3219 +3219 @@
 Exp_OverlayObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     int newfd, oldfd;
@@ -3310 +3310 @@
 Exp_InterpreterObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     Tcl_Obj *eofObj = 0;
@@ -3358 +3358 @@
 Exp_ExpContinueObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     if (objc == 1) {
@@ -3378 +3378 @@
 Exp_InterReturnObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])
 {
     /* let Tcl's return command worry about args */
@@ -3399 +3399 @@
 Exp_OpenObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     ExpState *esPtr;
@@ -3517 +3517 @@
                 !(Tcl_FindHashEntry(&globalNsPtr->cmdTable,c->name) ||
                         Tcl_FindHashEntry(&currNsPtr->cmdTable,c->name))) {
             if (c->objproc)
-                Tcl_CreateObjCommand(interp,c->name,
+                Tcl_CreateObjCommand2(interp,c->name,
                         c->objproc,c->data,exp_deleteObjProc);
             else
                 Tcl_CreateCommand(interp,c->name,c->proc,
@@ -3529 +3529 @@
                 && !(c->flags & EXP_NOPREFIX)) {
             sprintf(cmdnamebuf,"exp_%s",c->name);
             if (c->objproc)
-                Tcl_CreateObjCommand(interp,cmdnamebuf,c->objproc,c->data,
+                Tcl_CreateObjCommand2(interp,cmdnamebuf,c->objproc,c->data,
                         exp_deleteObjProc);
             else
                 Tcl_CreateCommand(interp,cmdnamebuf,c->proc,

exp_command.h

@@ -24 +24 @@
 #endif
 
 #include <tclPort.h>
+#include "expect.h"
 
 #define EXP_CHANNELNAMELEN (16 + TCL_INTEGER_SPACE)
 
-EXTERN char *           exp_get_var _ANSI_ARGS_((Tcl_Interp *,char *));
+EXTERN const char *             exp_get_var _ANSI_ARGS_((Tcl_Interp *,char *));
 
 EXTERN int exp_default_match_max;
 EXTERN int exp_default_parity;
@@ -210 +211 @@
 #define EXP_INDIRECT    2
 
 EXTERN void             expAdjust _ANSI_ARGS_((ExpState *));
-EXTERN int              expWriteChars _ANSI_ARGS_((ExpState *,char *,int));
+EXTERN int              expWriteChars _ANSI_ARGS_((ExpState *,const char *,int));
 EXTERN int              expWriteCharsUni _ANSI_ARGS_((ExpState *,Tcl_UniChar *,int));
 EXTERN void             exp_buffer_shuffle _ANSI_ARGS_((Tcl_Interp *,ExpState *,int,char *,char *));
 EXTERN int              exp_close _ANSI_ARGS_((Tcl_Interp *,ExpState *));
@@ -218 +219 @@
 EXTERN void             exp_ecmd_remove_fd_direct_and_indirect 
                                 _ANSI_ARGS_((Tcl_Interp *,int));
 EXTERN void             exp_trap_on _ANSI_ARGS_((int));
-EXTERN int              exp_trap_off _ANSI_ARGS_((char *));
+EXTERN int              exp_trap_off _ANSI_ARGS_((const char *));
 
 EXTERN void             exp_strftime(char *format, const struct tm *timeptr,Tcl_DString *dstring);
 
@@ -308 +309 @@
 
 struct exp_cmd_data {
         char            *name;
-        Tcl_ObjCmdProc  *objproc;
+        Tcl_ObjCmdProc2 *objproc;
         Tcl_CmdProc     *proc;
         ClientData      data;
         int             flags;
@@ -323 +324 @@
 EXTERN void             exp_init_interact_cmds _ANSI_ARGS_((Tcl_Interp *));
 EXTERN void             exp_init_tty_cmds();
 
-EXTERN ExpState *       expStateCheck _ANSI_ARGS_((Tcl_Interp *,ExpState *,int,int,char *));
+EXTERN ExpState *       expStateCheck _ANSI_ARGS_((Tcl_Interp *,ExpState *,int,int,const char *));
 EXTERN ExpState *       expStateCurrent _ANSI_ARGS_((Tcl_Interp *,int,int,int));
-EXTERN ExpState *       expStateFromChannelName _ANSI_ARGS_((Tcl_Interp *,char *,int,int,int,char *));
+EXTERN ExpState *       expStateFromChannelName _ANSI_ARGS_((Tcl_Interp *,const char *,int,int,int,const char *));
 EXTERN void             expStateFree _ANSI_ARGS_((ExpState *));
 
 EXTERN ExpState *       expCreateChannel _ANSI_ARGS_((Tcl_Interp *,int,int,int));

exp_int.h

@@ -20 +20 @@
 #endif
 
 #include <errno.h>
+#include "expect.h"
 
 void    exp_console_set     _ANSI_ARGS_((void));
 void    expDiagLogPtrSet    _ANSI_ARGS_((void (*)_ANSI_ARGS_((char *))));
@@ -27 +28 @@
 void    expDiagLogPtrX      _ANSI_ARGS_((char *,int));
 void    expDiagLogPtrStr    _ANSI_ARGS_((char *,char *));
 void    expDiagLogPtrStrStr _ANSI_ARGS_((char *,char *,char *));
-void    expErrnoMsgSet      _ANSI_ARGS_((char * (*) _ANSI_ARGS_((int))));
-char * expErrnoMsg    _ANSI_ARGS_((int));
+void    expErrnoMsgSet      _ANSI_ARGS_((const char * (*) _ANSI_ARGS_((int))));
+const char * expErrnoMsg    _ANSI_ARGS_((int));
 
 #ifdef NO_STDLIB_H
 #  include "../compat/stdlib.h"

exp_inter.c

@@ -696 +696 @@
 inter_updateproc(
     ClientData clientData,
     Tcl_Interp *interp, /* Interpreter containing variable. */
-    char *name1,        /* Name of variable. */
-    char *name2,        /* Second part of variable name. */
+    const char *name1,  /* Name of variable. */
+    const char *name2,  /* Second part of variable name. */
     int flags)          /* Information about what happened. */
 {
         exp_configure_count++;
@@ -714 +714 @@
 Exp_InteractObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST initial_objv[])              /* Argument objects. */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);

exp_log.c

@@ -110 +110 @@
 
 void
 expLogDiagU(buf)
-char *buf;
+const char *buf;
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
@@ -191 +191 @@
 /* use this function for logging the parent/child conversation */
 void
 expStdoutLogU(buf,force_stdout)
-char *buf;
+const char *buf;
 int force_stdout;       /* override value of logUser */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -240 +240 @@
 /*ARGSUSED*/
 void
 expErrorLogU(buf)
-char *buf;
+const char *buf;
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
@@ -401 +401 @@
 /* write 8-bit bytes */
 void
 expDiagWriteBytes(str,len)
-char *str;
+const char *str;
 int len;
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -414 +414 @@
 /* write UTF chars */
 void
 expDiagWriteChars(str,len)
-char *str;
+const char *str;
 int len;
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -633 +633 @@
 /* in diagnostic mode, "expect -d" */
 static char *
 expPrintifyReal(s)
-char *s;
+const char *s;
 {
         static int destlen = 0;
         static char *dest = 0;
@@ -726 +726 @@
 
 char *
 expPrintify(s) /* INTL */
-char *s;
+const char *s;
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 

exp_log.h

@@ -1 +1 @@
 /* exp_log.h */
 
+#include "expect.h"
+
 extern void             expErrorLog _ANSI_ARGS_(TCL_VARARGS(char *,fmt));
-extern void             expErrorLogU _ANSI_ARGS_((char *));
+extern void             expErrorLogU _ANSI_ARGS_((const char *));
 
 extern void             expStdoutLog _ANSI_ARGS_(TCL_VARARGS(int,force_stdout));
-extern void             expStdoutLogU _ANSI_ARGS_((char *buf, int force_stdout));
+extern void             expStdoutLogU _ANSI_ARGS_((const char *buf, int force_stdout));
 
 EXTERN void             expDiagInit _ANSI_ARGS_((void));
 EXTERN int              expDiagChannelOpen _ANSI_ARGS_((Tcl_Interp *,char *));
@@ -13 +15 @@
 EXTERN char *           expDiagFilename _ANSI_ARGS_((void));
 EXTERN int              expDiagToStderrGet _ANSI_ARGS_((void));
 EXTERN void             expDiagToStderrSet _ANSI_ARGS_((int));
-EXTERN void             expDiagWriteBytes _ANSI_ARGS_((char *,int));
-EXTERN void             expDiagWriteChars _ANSI_ARGS_((char *,int));
+EXTERN void             expDiagWriteBytes _ANSI_ARGS_((const char *,int));
+EXTERN void             expDiagWriteChars _ANSI_ARGS_((const char *,int));
 EXTERN void             expDiagWriteObj _ANSI_ARGS_((Tcl_Obj *));
 EXTERN void             expDiagLog _ANSI_ARGS_(TCL_VARARGS(char *,fmt));
 EXTERN void             expDiagLogU _ANSI_ARGS_((char *));
 
-EXTERN char *           expPrintify _ANSI_ARGS_((char *));
+EXTERN char *           expPrintify _ANSI_ARGS_((const char *));
 EXTERN char *           expPrintifyUni _ANSI_ARGS_((Tcl_UniChar *,int));
 EXTERN char *           expPrintifyObj _ANSI_ARGS_((Tcl_Obj *));
 EXTERN void             expPrintf _ANSI_ARGS_(TCL_VARARGS(char *,fmt));
@@ -38 +40 @@
 EXTERN int              expLogAllGet _ANSI_ARGS_((void));
 EXTERN void             expLogToStdoutSet _ANSI_ARGS_((int));
 EXTERN int              expLogToStdoutGet _ANSI_ARGS_((void));
-EXTERN void             expLogDiagU _ANSI_ARGS_((char *));
+EXTERN void             expLogDiagU _ANSI_ARGS_((const char *));
 EXTERN int              expWriteBytesAndLogIfTtyU _ANSI_ARGS_((ExpState *,Tcl_UniChar *,int));
 
 EXTERN int              expLogUserGet _ANSI_ARGS_((void));

exp_main_sub.c

@@ -227 +227 @@
 Tcl_Interp *interp;
 int check_for_nostack;
 {
-        char *msg;
+        const char *msg;
 
         /* if errorInfo has something, print it */
     /* else use what's in the interp result */
@@ -253 +253 @@
         /* no \n at end, since ccmd will already have one. */
         /* Actually, this is not true if command is last in */
         /* file and has no newline after it, oh well */
-        expErrorLogU(exp_cook(msg,(int *)0));
+        expErrorLogU(exp_cook(msg,NULL));
         expErrorLogU("\r\n");
 }
 
@@ -394 +394 @@
             case TCL_OK:
                 str = Tcl_GetStringResult(interp);
                 if (*str != 0) {
-                    expStdoutLogU(exp_cook(str,(int *)0),1);
+                    expStdoutLogU(exp_cook(str,NULL),1);
                     expStdoutLogU("\r\n",1);
                 }
                 continue;
@@ -543 +543 @@
       return TCL_ERROR;
     }
 #else
-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "9.0", 0) == NULL) {
       return TCL_ERROR;
     }
 #endif
@@ -713 +713 @@
                         exp_cmdlinecmds = TRUE;
                         rc = Tcl_Eval(interp,optarg);
                         if (rc != TCL_OK) {
-                            expErrorLogU(exp_cook(Tcl_GetVar(interp,"errorInfo",TCL_GLOBAL_ONLY),(int *)0));
+                            expErrorLogU(exp_cook(Tcl_GetVar(interp,"errorInfo",TCL_GLOBAL_ONLY),NULL));
                             expErrorLogU("\r\n");
                         }
                         break;
@@ -861 +861 @@
                 expDiagLog("set argv0 \"%s\"\r\n",exp_argv0);
         }
 
-        args = Tcl_Merge(argc-optind,argv+optind);
+        /* TODO: Is the cast safe? */
+        args = Tcl_Merge(argc-optind,(const char **)(argv+optind));
         expDiagLogU("set argv \"");
         expDiagLogU(args);
         expDiagLogU("\"\r\n");

exp_pty.c

@@ -351 +351 @@
   (*expDiagLogPtrVal)(buf);
 }
 
-static char *           (*expErrnoMsgVal) _ANSI_ARGS_((int));
+static const char *             (*expErrnoMsgVal) _ANSI_ARGS_((int));
 
-char *
+const char *
 expErrnoMsg(errorNo)
 int errorNo;
 {
@@ -362 +362 @@
 
 void
 expErrnoMsgSet(fn)
-     char * (*fn) _ANSI_ARGS_((int));
+     const char * (*fn) _ANSI_ARGS_((int));
 {
   expErrnoMsgVal = fn;
 }

exp_trap.c

@@ -147 +147 @@
                 Tcl_AsyncMark(async_handler);
         } else {
                 got_sig = -1;
-                for (i=1;i<NSIG;i++) {
+                for (int i=1;i<NSIG;i++) {
                         if (traps[i].mark) {
                                 got_sig = i;
                                 Tcl_AsyncMark(async_handler);
@@ -304 +304 @@
 Tcl_Obj *CONST objv[];
 {
         char *action = 0;
-        int n;          /* number of signals in list */
+        Tcl_Size n;             /* number of signals in list */
         Tcl_Obj **list; /* list of signals */
         char *arg;
         int len;        /* length of action */
-        int i;
         int show_name = FALSE;  /* if user asked for current sig by name */
         int show_number = FALSE;/* if user asked for current sig by number */
         int show_max = FALSE;   /* if user asked for NSIG-1 */
@@ -382 +381 @@
           return TCL_ERROR;
         }
 
-        for (i=0;i<n;i++) {
+        for (Tcl_Size i=0;i<n;i++) {
           char *s;
           int sig;
 
@@ -509 +508 @@
 
                 if (eip) {
                   /* odd that Tcl doesn't have a call that does all this at once */
-                  int len;
+                  Tcl_Size len;
                   char *s = Tcl_GetStringFromObj(eip,&len);
                   Tcl_AddObjErrorInfo(interp,s,len);
                   Tcl_DecrRefCount(eip);

exp_tty.c

@@ -277 +277 @@
 /* to write send_user strings without always putting in \r. */
 /* If len == 0, use strlen to compute it */
 /* NB: if terminal is not in raw mode, nothing is done. */
-char *
+const char *
 exp_cook(
-    char *s,
-    int *len)   /* current and new length of s */
+    const char *s,
+    Tcl_Size *len)      /* current and new length of s */
 {
         static int destlen = 0;
         static char *dest = 0;
@@ -316 +316 @@
 exec_stty(
     Tcl_Interp *interp,
     int argc,
-    char **argv,
+    const char **argv,
     int devtty)         /* if true, redirect to /dev/tty */
 {
         int i;
@@ -370 +370 @@
     ClientData clientData,
     Tcl_Interp *interp,
     int argc,
-    char **argv)
+    const char **argv)
 {
         /* redirection symbol is not counted as a stty arg in terms */
         /* of recognition. */
@@ -382 +382 @@
         int cooked = FALSE;
         int was_raw, was_echo;
 
-        char **redirect;        /* location of "<" */
-        char *infile = 0;
+        const char **redirect;  /* location of "<" */
+        const char *infile = 0;
         int fd;                 /* (slave) fd of infile */
         int master = -1;        /* master fd of infile */
-        char **argv0 = argv;
+        const char **argv0 = argv;
 
         for (argv=argv0+1;*argv;argv++) {
                 if (argv[0][0] == '<') {
@@ -507 +507 @@
                 /* a different tty */
 
                 /* temporarily zap redirect */
-                char *redirect_save = *redirect;
+                const char *redirect_save = *redirect;
                 *redirect = 0;
 
                 for (argv=argv0+1;*argv;argv++) {
@@ -569 +569 @@
     ClientData clientData,
     Tcl_Interp *interp,
     int argc,
-    char **argv)
+    const char **argv)
 {
         int result = TCL_OK;
         RETSIGTYPE (*old)();    /* save old sigalarm handler */

exp_win.c

@@ -78 +78 @@
 static exp_winsize winsize = {0, 0};
 static exp_winsize win2size = {0, 0};
 
-int exp_window_size_set(fd)
+void exp_window_size_set(fd)
 int fd;
 {
 #ifdef TIOCSWINSZ
@@ -89 +89 @@
 #endif
 }
 
-int exp_window_size_get(fd)
+void exp_window_size_get(fd)
 int fd;
 {
 #ifdef TIOCGWINSZ
@@ -106 +106 @@
 
 void
 exp_win_rows_set(rows)
-char *rows;
+const char *rows;
 {
         winsize.rows = atoi(rows);
         exp_window_size_set(exp_dev_tty);
@@ -123 +123 @@
 
 void
 exp_win_columns_set(columns)
-char *columns;
+const char *columns;
 {
         winsize.columns = atoi(columns);
         exp_window_size_set(exp_dev_tty);
@@ -142 +142 @@
  * separate copy of everything above - used for handling user stty requests
  */
 
-int exp_win2_size_set(fd)
+void exp_win2_size_set(fd)
 int fd;
 {
 #ifdef TIOCSWINSZ
@@ -153 +153 @@
 #endif
 }
 
-int exp_win2_size_get(fd)
+void exp_win2_size_get(fd)
 int fd;
 {
 #ifdef TIOCGWINSZ
@@ -167 +167 @@
 void
 exp_win2_rows_set(fd,rows)
 int fd;
-char *rows;
+const char *rows;
 {
         exp_win2_size_get(fd);
         win2size.rows = atoi(rows);
@@ -191 +191 @@
 void
 exp_win2_columns_set(fd,columns)
 int fd;
-char *columns;
+const char *columns;
 {
         exp_win2_size_get(fd);
         win2size.columns = atoi(columns);

exp_win.h

@@ -6 +6 @@
 would appreciate credit if you use this file or parts of it.
 */
 
-#include <tcl.h> /* For _ANSI_ARGS_ */
+#include "expect.h" /* For _ANSI_ARGS_ */
 
-int exp_window_size_set();
-int exp_window_size_get();
+void exp_window_size_set();
+void exp_window_size_get();
 
-void  exp_win_rows_set    _ANSI_ARGS_ ((char* rows));
+void  exp_win_rows_set    _ANSI_ARGS_ ((const char* rows));
 char* exp_win_rows_get    _ANSI_ARGS_ ((void));
-void  exp_win_columns_set _ANSI_ARGS_ ((char* columns));
+void  exp_win_columns_set _ANSI_ARGS_ ((const char* columns));
 char* exp_win_columns_get _ANSI_ARGS_ ((void));
 
-void  exp_win2_rows_set    _ANSI_ARGS_ ((int fd, char* rows));
+void  exp_win2_rows_set    _ANSI_ARGS_ ((int fd, const char* rows));
 char* exp_win2_rows_get    _ANSI_ARGS_ ((int fd));
-void  exp_win2_columns_set _ANSI_ARGS_ ((int fd, char* columns));
+void  exp_win2_columns_set _ANSI_ARGS_ ((int fd, const char* columns));
 char* exp_win2_columns_get _ANSI_ARGS_ ((int fd));

expect.c

@@ -163 +163 @@
 static char *exp_indirect_update2( /* 2-part Tcl variable names */
     ClientData clientData,
     Tcl_Interp *interp, /* Interpreter containing variable. */
-    char *name1,        /* Name of variable. */
-    char *name2,        /* Second part of variable name. */
+    const char *name1,  /* Name of variable. */
+    const char *name2,  /* Second part of variable name. */
     int flags);         /* Information about what happened. */
 
 #ifdef SIMPLE_EVENT
@@ -285 +285 @@
     CONST char *p;
     CONST char *next;
     int rc;
-    int bytesLeft, numWords;
+    Tcl_Size bytesLeft;
+    int numWords;
     Tcl_Parse parse;
 
     /*
@@ -325 +326 @@
                  numWords--, tokenPtr += (tokenPtr->numComponents + 1)) {
                 /* FUTURE: Save token information, do substitution later */
 
-                Tcl_Obj* w = Tcl_EvalTokens(interp, tokenPtr+1,
+                rc = Tcl_EvalTokensStandard(interp, tokenPtr+1,
                         tokenPtr->numComponents);
+                Tcl_Obj* w = (rc == TCL_OK ? Tcl_GetObjResult(interp) : NULL);
                 /* w has refCount 1 here, if not NULL */
                 if (w == NULL) {
                     Tcl_DecrRefCount (res);
@@ -335 +337 @@
 
                 }
                 Tcl_ListObjAppendElement (interp, res, w);
-                Tcl_DecrRefCount (w); /* Local reference goes away */
+                Tcl_ResetResult (interp); /* Local reference goes away */
             }
         }
 
@@ -490 +492 @@
                 {
                     Tcl_Obj* g;
                     Tcl_UniChar* str;
-                    int strlen;
+                    Tcl_Size strlen;
 
                     str = Tcl_GetUnicodeFromObj (objv[i], &strlen);
                     g = exp_retoglob (str, strlen);
@@ -852 +854 @@
         expDiagLog("\"? ");
 
         if (e->gate) {
-            int plen;
+            Tcl_Size plen;
             Tcl_UniChar* pat = Tcl_GetUnicodeFromObj(e->gate,&plen);
 
             expDiagLog("Gate \"");
@@ -915 +917 @@
         expDiagLogU(expPrintify(Tcl_GetString(e->pat)));
         expDiagLog("\"? ");
         if (str) {
-            int plen;
+            Tcl_Size plen;
             Tcl_UniChar* pat = Tcl_GetUnicodeFromObj(e->pat,&plen);
 
             match = Exp_StringCaseMatch(str,numchars, pat, plen,
@@ -932 +934 @@
         }
         expDiagLogU(no);
     } else if (e->use == PAT_EXACT) {
-        int patLength;
+        Tcl_Size patLength;
         char *pat = Tcl_GetStringFromObj(e->pat, &patLength);
         Tcl_UniChar *p;
 
@@ -1384 +1386 @@
 Exp_ExpectGlobalObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     int result = TCL_OK;
@@ -2042 +2044 @@
 This allows the user to localize them if desired, and also to
 avoid having to put "global" in procedure definitions.
 */
-char *
+const char *
 exp_get_var(
     Tcl_Interp *interp,
     char *var)
 {
-    char *val;
+    const char *val;
 
     if (NULL != (val = Tcl_GetVar(interp,var,0 /* local */)))
         return(val);
@@ -2121 +2123 @@
 exp_indirect_update2(
     ClientData clientData,
     Tcl_Interp *interp, /* Interpreter containing variable. */
-    char *name1,        /* Name of variable. */
-    char *name2,        /* Second part of variable name. */
+    const char *name1,  /* Name of variable. */
+    const char *name2,  /* Second part of variable name. */
     int flags)          /* Information about what happened. */
 {
         char *msg;
@@ -2525 +2527 @@
 Exp_ExpectObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     int cc;                     /* number of chars returned in a single read */
@@ -2782 +2784 @@
 Exp_TimestampObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
         char *format = 0;
@@ -2962 +2964 @@
 Exp_MatchMaxObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     int size = -1;
@@ -3008 +3010 @@
 Exp_RemoveNullsObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     int value = -1;
@@ -3052 +3054 @@
 Exp_ParityObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     int parity;
@@ -3091 +3093 @@
 Exp_CloseOnEofObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *CONST objv[])              /* Argument objects. */
 {
     int close_on_eof;

expect.h

@@ -12 +12 @@
 #define _EXPECT_H
 
 #include <stdio.h>
+#include <stdarg.h>
 #include <setjmp.h>
-
-/*
- * tcl.h --
- *
- *      This header file describes the externally-visible facilities
- *      of the Tcl interpreter.
- *
- * Copyright (c) 1987-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 1993-1996 Lucent Technologies.
- * Copyright (c) 1998-1999 Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: expect.h,v 5.32 2010/07/01 00:53:49 eee Exp $
- */
-
-#ifndef _TCL
-#define _TCL
-
-#ifndef __WIN32__
-#   if defined(_WIN32) || defined(WIN32)
-#       define __WIN32__
-#   endif
-#endif
-
-#ifdef __WIN32__
-#   ifndef STRICT
-#       define STRICT
-#   endif
-#   ifndef USE_PROTOTYPE
-#       define USE_PROTOTYPE 1
-#   endif
-#   ifndef HAS_STDARG
-#       define HAS_STDARG 1
-#   endif
-#   ifndef USE_PROTOTYPE
-#       define USE_PROTOTYPE 1
-#   endif
-
-/*
- * Under Windows we need to call Tcl_Alloc in all cases to avoid competing
- * C run-time library issues.
- */
-
-#   ifndef USE_TCLALLOC
-#       define USE_TCLALLOC 1
-#   endif
-#endif /* __WIN32__ */
-
-/*
- * The following definitions set up the proper options for Macintosh
- * compilers.  We use this method because there is no autoconf equivalent.
- */
-
-#ifdef MAC_TCL
-#   ifndef HAS_STDARG
-#       define HAS_STDARG 1
-#   endif
-#   ifndef USE_TCLALLOC
-#       define USE_TCLALLOC 1
-#   endif
-#   ifndef NO_STRERROR
-#       define NO_STRERROR 1
-#   endif
-#endif
-
-/*
- * Utility macros: STRINGIFY takes an argument and wraps it in "" (double
- * quotation marks), JOIN joins two arguments.
- */
-
-#define VERBATIM(x) x
-#ifdef _MSC_VER
-# define STRINGIFY(x) STRINGIFY1(x)
-# define STRINGIFY1(x) #x
-# define JOIN(a,b) JOIN1(a,b)
-# define JOIN1(a,b) a##b
-#else
-# ifdef RESOURCE_INCLUDED
-#  define STRINGIFY(x) STRINGIFY1(x)
-#  define STRINGIFY1(x) #x
-#  define JOIN(a,b) JOIN1(a,b)
-#  define JOIN1(a,b) a##b
-# else
-#  ifdef __STDC__
-#   define STRINGIFY(x) #x
-#   define JOIN(a,b) a##b
-#  else
-#   define STRINGIFY(x) "x"
-#   define JOIN(a,b) VERBATIM(a)VERBATIM(b)
-#  endif
-# endif
-#endif
-
-/* 
- * A special definition used to allow this header file to be included 
- * in resource files so that they can get obtain version information from
- * this file.  Resource compilers don't like all the C stuff, like typedefs
- * and procedure declarations, that occur below.
- */
-
-#ifndef RESOURCE_INCLUDED
-
-#ifndef BUFSIZ
-#include <stdio.h>
-#endif
-
-/*
- * Definitions that allow Tcl functions with variable numbers of
- * arguments to be used with either varargs.h or stdarg.h.  TCL_VARARGS
- * is used in procedure prototypes.  TCL_VARARGS_DEF is used to declare
- * the arguments in a function definiton: it takes the type and name of
- * the first argument and supplies the appropriate argument declaration
- * string for use in the function definition.  TCL_VARARGS_START
- * initializes the va_list data structure and returns the first argument.
- */
-
-#if defined(__STDC__) || defined(HAS_STDARG)
-#   include <stdarg.h>
-
-#   define TCL_VARARGS(type, name) (type name, ...)
-#   define TCL_VARARGS_DEF(type, name) (type name, ...)
-#   define TCL_VARARGS_START(type, name, list) (va_start(list, name), name)
-#else
-#   include <varargs.h>
-
-#   ifdef __cplusplus
-#       define TCL_VARARGS(type, name) (type name, ...)
-#       define TCL_VARARGS_DEF(type, name) (type va_alist, ...)
-#   else
-#       define TCL_VARARGS(type, name) ()
-#       define TCL_VARARGS_DEF(type, name) (va_alist)
-#   endif
-#   define TCL_VARARGS_START(type, name, list) \
-        (va_start(list), va_arg(list, type))
-#endif
-
-/*
- * Macros used to declare a function to be exported by a DLL.
- * Used by Windows, maps to no-op declarations on non-Windows systems.
- * The default build on windows is for a DLL, which causes the DLLIMPORT
- * and DLLEXPORT macros to be nonempty. To build a static library, the
- * macro STATIC_BUILD should be defined.
- */
-
-#ifdef STATIC_BUILD
-# define DLLIMPORT
-# define DLLEXPORT
-#else
-# if defined(__WIN32__) && (defined(_MSC_VER) || (defined(__GNUC__) && defined(__declspec)))
-#   define DLLIMPORT __declspec(dllimport)
-#   define DLLEXPORT __declspec(dllexport)
-# else
-#  define DLLIMPORT
-#  define DLLEXPORT
-# endif
-#endif
-
-/*
- * These macros are used to control whether functions are being declared for
- * import or export.  If a function is being declared while it is being built
- * to be included in a shared library, then it should have the DLLEXPORT
- * storage class.  If is being declared for use by a module that is going to
- * link against the shared library, then it should have the DLLIMPORT storage
- * class.  If the symbol is beind declared for a static build or for use from a
- * stub library, then the storage class should be empty.
- *
- * The convention is that a macro called BUILD_xxxx, where xxxx is the
- * name of a library we are building, is set on the compile line for sources
- * that are to be placed in the library.  When this macro is set, the
- * storage class will be set to DLLEXPORT.  At the end of the header file, the
- * storage class will be reset to DLLIMPORt.
- */
-
-#undef TCL_STORAGE_CLASS
-#ifdef BUILD_tcl
-# define TCL_STORAGE_CLASS DLLEXPORT
-#else
-# ifdef USE_TCL_STUBS
-#  define TCL_STORAGE_CLASS
-# else
-#  define TCL_STORAGE_CLASS DLLIMPORT
-# endif
-#endif
-
-/*
- * Definitions that allow this header file to be used either with or
- * without ANSI C features like function prototypes.  */
+#include <tcl.h>
 
 #undef _ANSI_ARGS_
 #undef CONST
-
-#if ((defined(__STDC__) || defined(SABER)) && !defined(NO_PROTOTYPE)) || defined(__cplusplus) || defined(USE_PROTOTYPE)
-#   define _USING_PROTOTYPES_ 1
-#   define _ANSI_ARGS_(x)       x
-#   define CONST const
-#else
-#   define _ANSI_ARGS_(x)       ()
-#   define CONST
-#endif
-
-#ifdef __cplusplus
-#   define EXTERN extern "C" TCL_STORAGE_CLASS
-#else
-#   define EXTERN extern TCL_STORAGE_CLASS
-#endif
-
-/*
- * Macro to use instead of "void" for arguments that must have
- * type "void *" in ANSI C;  maps them to type "char *" in
- * non-ANSI systems.
- */
-#ifndef __WIN32__
-#ifndef VOID
-#   ifdef __STDC__
-#       define VOID void
-#   else
-#       define VOID char
-#   endif
-#endif
-#else /* __WIN32__ */
-/*
- * The following code is copied from winnt.h
- */
-#ifndef VOID
-#define VOID void
-typedef char CHAR;
-typedef short SHORT;
-typedef long LONG;
-#endif
-#endif /* __WIN32__ */
-
-/*
- * Miscellaneous declarations.
- */
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-typedef struct Tcl_RegExp_ *Tcl_RegExp;
-
-/*
- * These function have been renamed. The old names are deprecated, but we
- * define these macros for backwards compatibilty.
- */
-
-#define Tcl_Ckalloc Tcl_Alloc
-#define Tcl_Ckfree Tcl_Free
-#define Tcl_Ckrealloc Tcl_Realloc
-#define Tcl_Return Tcl_SetResult
-#define Tcl_TildeSubst Tcl_TranslateFileName
-
-#endif /* RESOURCE_INCLUDED */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
-#endif /* _TCL */
-
-/*
- * end of tcl.h definitions
- */
-
+#undef CONST84
+#undef TCL_VARARGS
+#undef TCL_VARARGS_DEF
+#undef TCL_VARARGS_START
+
+#define _ANSI_ARGS_(x)  x
+#define CONST const
+#define CONST84 const
+#define TCL_VARARGS(type, name) (type name, ...)
+#define TCL_VARARGS_DEF(type, name) (type name, ...)
+#define TCL_VARARGS_START(type, name, list) (va_start(list, name), name)
 
 /*
  * regexp definitions - from tcl8.0/tclRegexp.h

expect_tcl.h

@@ -13 +13 @@
 #define _EXPECT_TCL_H
 
 #include <stdio.h>
-#include "expect_comm.h"
+#include "expect.h"
 
 /*
  * This is a convenience macro used to initialize a thread local storage ptr.
@@ -44 +44 @@
 EXTERN int      exp_interpret_cmdfilename _ANSI_ARGS_((Tcl_Interp *,char *));
 EXTERN void     exp_interpret_rcfiles _ANSI_ARGS_((Tcl_Interp *,int my_rc,int sys_rc));
 
-EXTERN char *   exp_cook _ANSI_ARGS_((char *s,int *len));
+EXTERN const char *     exp_cook _ANSI_ARGS_((const char *s,Tcl_Size *len));
 
 EXTERN void     expCloseOnExec _ANSI_ARGS_((int));
 

retoglob.c

@@ -100 +100 @@
 #define CHOPC(c) {while (*str != (c) && strlen) CHOP(1) ;}
 #define EMIT(c)  {lastsz = 1; *nexto++ = (c);}
 #define EMITX(c) {lastsz++;   *nexto++ = (c);}
-#define MATCH(lit) ((strlen >= (sizeof (lit)/sizeof (Tcl_UniChar))) && (0 == Tcl_UniCharNcmp (str,(lit),sizeof(lit)/sizeof (Tcl_UniChar))))
+#define MATCH(lit) ((strlen >= (sizeof (lit)/sizeof (Tcl_UniChar))) && (0 == memcmp (str,(lit),sizeof(lit))))
 #define MATCHC(c) (strlen && (*str == (c)))
 #define PUSHPAREN {*nextp++ = nexto;}
 #define UNEMIT {nexto -= lastsz; lastsz = -1;}

tcldbg.h

@@ -12 +12 @@
 #ifndef _NIST_DBG
 #define _NIST_DBG
 
-#include "tcl.h"
+#include "expect.h"
 
 typedef int (Dbg_InterProc) _ANSI_ARGS_((Tcl_Interp *interp, ClientData data));
 typedef int (Dbg_IgnoreFuncsProc) _ANSI_ARGS_((