diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 8 | ||||
| -rw-r--r-- | generic/tclCmdIL.c | 13 | ||||
| -rw-r--r-- | generic/tclIO.c | 16 | ||||
| -rw-r--r-- | generic/tclInt.h | 3 | ||||
| -rw-r--r-- | generic/tclListObj.c | 3 | ||||
| -rw-r--r-- | generic/tclNotify.c | 8 | ||||
| -rw-r--r-- | generic/tclResolve.c | 7 | ||||
| -rw-r--r-- | generic/tclTest.c | 20 | ||||
| -rw-r--r-- | generic/tclTestProcBodyObj.c | 4 |
9 files changed, 41 insertions, 41 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 319e3ba..783246e 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -7,11 +7,12 @@ * Copyright (c) 1987-1994 The Regents of the University of California. * Copyright (c) 1993-1996 Lucent Technologies. * Copyright (c) 1994-1998 Sun Microsystems, Inc. + * Copyright (c) 1998 by 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: tcl.h,v 1.1.2.4 1998/11/04 04:39:52 stanton Exp $ + * RCS: @(#) $Id: tcl.h,v 1.1.2.5 1998/11/11 04:08:15 stanton Exp $ */ #ifndef _TCL @@ -25,12 +26,13 @@ * library/init.tcl (only if major.minor changes, not patchlevel) * unix/configure.in * unix/pkginfo - * win/makefile.bc - * win/makefile.vc + * win/makefile.bc (only if major.minor changes, not patchlevel) + * win/makefile.vc (only if major.minor changes, not patchlevel) * win/pkgIndex.tcl (for tclregNN.dll) * README * mac/README * win/README + * win/README.binary * unix/README * * The release level should be 0 for alpha, 1 for beta, and 2 for diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index 6b4cc39..f26580d 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -9,11 +9,12 @@ * Copyright (c) 1987-1993 The Regents of the University of California. * Copyright (c) 1993-1997 Lucent Technologies. * Copyright (c) 1994-1997 Sun Microsystems, Inc. + * Copyright (c) 1998 by 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: tclCmdIL.c,v 1.1.2.3 1998/10/21 20:40:04 stanton Exp $ + * RCS: @(#) $Id: tclCmdIL.c,v 1.1.2.4 1998/11/11 04:08:15 stanton Exp $ */ #include "tclInt.h" @@ -782,19 +783,17 @@ InfoCompleteCmd(dummy, interp, objc, objv) int objc; /* Number of arguments. */ Tcl_Obj *CONST objv[]; /* Argument objects. */ { - char *command; - if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "command"); return TCL_ERROR; } - command = Tcl_GetString(objv[2]); - if (Tcl_CommandComplete(command)) { + if (TclObjCommandComplete(objv[2])) { Tcl_SetIntObj(Tcl_GetObjResult(interp), 1); } else { Tcl_SetIntObj(Tcl_GetObjResult(interp), 0); } + return TCL_OK; } @@ -2890,11 +2889,11 @@ DictionaryCompare(left, right) */ zeros = 0; - while ((*right == '0') && (*(right + 1) != '\0')) { + while ((*right == '0') && (isdigit(UCHAR(right[1])))) { right++; zeros--; } - while ((*left == '0') && (*(left + 1) != '\0')) { + while ((*left == '0') && (isdigit(UCHAR(left[1])))) { left++; zeros++; } diff --git a/generic/tclIO.c b/generic/tclIO.c index 0faffff..42fcf44 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclIO.c,v 1.1.2.2 1998/09/24 23:58:51 stanton Exp $ + * RCS: @(#) $Id: tclIO.c,v 1.1.2.3 1998/11/11 04:08:16 stanton Exp $ */ #include "tclInt.h" @@ -5546,13 +5546,10 @@ Tcl_NotifyChannel(channel, mask) NextChannelHandler nh; /* - * Prevent the event handler from deleting the channel by incrementing - * the channel's ref count. Case in point: ChannelEventScriptInvoker() - * was evaling a script (owned by the channel) which caused the channel - * to be closed and then the byte codes no longer existed. + * Preserve the channel struct in case the script closes it. */ - Tcl_RegisterChannel(NULL, channel); + Tcl_Preserve((ClientData) channel); /* * If we are flushing in the background, be sure to call FlushChannel @@ -5600,12 +5597,7 @@ Tcl_NotifyChannel(channel, mask) UpdateInterest(chanPtr); } - /* - * No longer need to protect the channel from being deleted. - * After this point it is unsafe to use the value of "channel". - */ - - Tcl_UnregisterChannel((Tcl_Interp *) NULL, channel); + Tcl_Release((ClientData) channel); tsdPtr->nestedHandlerPtr = nh.nestedHandlerPtr; } diff --git a/generic/tclInt.h b/generic/tclInt.h index 0babdfd..55eaaad 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -6,11 +6,12 @@ * Copyright (c) 1987-1993 The Regents of the University of California. * Copyright (c) 1993-1997 Lucent Technologies. * Copyright (c) 1994-1998 Sun Microsystems, Inc. + * Copyright (c) 1998 by 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: tclInt.h,v 1.1.2.7 1998/10/21 20:40:06 stanton Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.1.2.8 1998/11/11 04:08:21 stanton Exp $ */ #ifndef _TCLINT diff --git a/generic/tclListObj.c b/generic/tclListObj.c index 931c821..27b8145 100644 --- a/generic/tclListObj.c +++ b/generic/tclListObj.c @@ -5,11 +5,12 @@ * type. * * Copyright (c) 1995-1997 Sun Microsystems, Inc. + * Copyright (c) 1998 by 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: tclListObj.c,v 1.1.2.2 1998/09/24 23:58:55 stanton Exp $ + * RCS: @(#) $Id: tclListObj.c,v 1.1.2.3 1998/11/11 04:08:22 stanton Exp $ */ #include "tclInt.h" diff --git a/generic/tclNotify.c b/generic/tclNotify.c index 4d85b66..b58a347 100644 --- a/generic/tclNotify.c +++ b/generic/tclNotify.c @@ -8,11 +8,12 @@ * tcl*Notify.c files in each platform directory. * * Copyright (c) 1995-1997 Sun Microsystems, Inc. + * Copyright (c) 1998 by 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: tclNotify.c,v 1.1.2.2 1998/09/24 23:58:59 stanton Exp $ + * RCS: @(#) $Id: tclNotify.c,v 1.1.2.3 1998/11/11 04:08:22 stanton Exp $ */ #include "tclInt.h" @@ -458,8 +459,11 @@ Tcl_DeleteEvents(proc, clientData) if (tsdPtr->firstEventPtr == evPtr) { tsdPtr->firstEventPtr = evPtr->nextPtr; if (evPtr->nextPtr == (Tcl_Event *) NULL) { - tsdPtr->lastEventPtr = (Tcl_Event *) NULL; + tsdPtr->lastEventPtr = prevPtr; } + if (tsdPtr->markerEventPtr == evPtr) { + tsdPtr->markerEventPtr = prevPtr; + } } else { prevPtr->nextPtr = evPtr->nextPtr; } diff --git a/generic/tclResolve.c b/generic/tclResolve.c index 230e93f..446149b 100644 --- a/generic/tclResolve.c +++ b/generic/tclResolve.c @@ -9,15 +9,10 @@ * * Copyright (c) 1998 Lucent Technologies, Inc. * - * Originally implemented by - * Michael J. McLennan - * Bell Labs Innovations for Lucent Technologies - * mmclennan@lucent.com - * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclResolve.c,v 1.1.2.1 1998/09/24 23:59:02 stanton Exp $ + * RCS: @(#) $Id: tclResolve.c,v 1.1.2.2 1998/11/11 04:08:22 stanton Exp $ */ #include "tclInt.h" diff --git a/generic/tclTest.c b/generic/tclTest.c index b408fee..eee8c37 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclTest.c,v 1.1.2.4 1998/11/11 01:44:54 stanton Exp $ + * RCS: @(#) $Id: tclTest.c,v 1.1.2.5 1998/11/11 04:08:22 stanton Exp $ */ #define TCL_TEST @@ -3963,14 +3963,18 @@ TeststatprocCmd (dummy, interp, argc, argv) return retVal; } - +/* Be careful in the compares in these tests, since the Macintosh puts a + * leading : in the beginning of non-absolute paths before passing them + * into the file command procedures. + */ + static int TestStatProc1(path, buf) CONST char *path; TclStat_ *buf; { buf->st_size = 1234; - return (strcmp("testStat1%.fil", path) ? -1 : 0); + return ((strstr(path, "testStat1%.fil") == NULL) ? -1 : 0); } @@ -3980,7 +3984,7 @@ TestStatProc2(path, buf) TclStat_ *buf; { buf->st_size = 2345; - return (strcmp("testStat2%.fil", path) ? -1 : 0); + return ((strstr(path, "testStat2%.fil") == NULL) ? -1 : 0); } @@ -3990,7 +3994,7 @@ TestStatProc3(path, buf) TclStat_ *buf; { buf->st_size = 3456; - return (strcmp("testStat3%.fil", path) ? -1 : 0); + return ((strstr(path, "testStat3%.fil") == NULL) ? -1 : 0); } /* @@ -4073,7 +4077,7 @@ TestAccessProc1(path, mode) CONST char *path; int mode; { - return (strcmp("testAccess1%.fil", path) ? -1 : 0); + return ((strstr(path, "testAccess1%.fil") == NULL) ? -1 : 0); } @@ -4082,7 +4086,7 @@ TestAccessProc2(path, mode) CONST char *path; int mode; { - return (strcmp("testAccess2%.fil", path) ? -1 : 0); + return ((strstr(path, "testAccess2%.fil") == NULL) ? -1 : 0); } @@ -4091,7 +4095,7 @@ TestAccessProc3(path, mode) CONST char *path; int mode; { - return (strcmp("testAccess3%.fil", path) ? -1 : 0); + return ((strstr(path, "testAccess3%.fil") == NULL) ? -1 : 0); } /* diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c index bfd2dcc..38eb189 100644 --- a/generic/tclTestProcBodyObj.c +++ b/generic/tclTestProcBodyObj.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclTestProcBodyObj.c,v 1.1.2.1 1998/10/06 02:59:05 stanton Exp $ + * RCS: @(#) $Id: tclTestProcBodyObj.c,v 1.1.2.2 1998/11/11 04:08:24 stanton Exp $ */ #include "tclInt.h" @@ -50,6 +50,8 @@ static int ProcBodyTestInitInternal _ANSI_ARGS_((Tcl_Interp *interp, int isSafe)); static int RegisterCommand _ANSI_ARGS_((Tcl_Interp* interp, char *namespace, CONST CmdTable *cmdTablePtr)); +int Procbodytest_Init _ANSI_ARGS_((Tcl_Interp * interp)); +int Procbodytest_SafeInit _ANSI_ARGS_((Tcl_Interp * interp)); /* * List of commands to create when the package is loaded; must go after the |