diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-11 11:48:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-11 11:48:38 (GMT) |
| commit | cfce00e636e389f48c32d61c5483a913a0a9d656 (patch) | |
| tree | c9a801ef36f2cf95b58dcb55dd72e10ecfe02f67 /unix | |
| parent | 6b32cafc8e54ed1a7bee854a77191c18186d905e (diff) | |
| parent | fa87897c16b0dc6d903c1be0dc80389d9cd072e3 (diff) | |
| download | tk-cfce00e636e389f48c32d61c5483a913a0a9d656.zip tk-cfce00e636e389f48c32d61c5483a913a0a9d656.tar.gz tk-cfce00e636e389f48c32d61c5483a913a0a9d656.tar.bz2 | |
Eliminate all usage of deprecated Tcl_EvalObj, Tcl_GlobalEval and Tcl_GlobalEvalObj functions.
Add [file normalize] to pkgIndex.tcl, in order to prevent '..' in file paths.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 8 | ||||
| -rw-r--r-- | unix/tkUnixSend.c | 6 | ||||
| -rw-r--r-- | unix/tkUnixWm.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 1df6721..2179ab9 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -728,16 +728,16 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} echo "Creating package index $(PKG_INDEX)"; \ rm -f "$(PKG_INDEX)"; \ (\ - echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} return";\ + echo "if {[catch {package present Tcl 8.6.0}]} return";\ relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \ - echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ + echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}$(TK_LIB_FILE)]] Tk]";\ else \ echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\ echo " || ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\ - echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)] Tk]";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)]] Tk]";\ echo "} else {";\ - echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll] Tk]";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll]] Tk]";\ echo "}";\ fi \ ) > "$(PKG_INDEX)"; \ diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c index e3a810d..15817eb 100644 --- a/unix/tkUnixSend.c +++ b/unix/tkUnixSend.c @@ -1024,7 +1024,7 @@ Tk_SendCmd( localInterp = riPtr->interp; Tcl_Preserve(localInterp); if (firstArg == (argc-1)) { - result = Tcl_GlobalEval(localInterp, argv[firstArg]); + result = Tcl_EvalEx(localInterp, argv[firstArg], -1, TCL_EVAL_GLOBAL); } else { Tcl_DStringInit(&request); Tcl_DStringAppend(&request, argv[firstArg], -1); @@ -1032,7 +1032,7 @@ Tk_SendCmd( Tcl_DStringAppend(&request, " ", 1); Tcl_DStringAppend(&request, argv[i], -1); } - result = Tcl_GlobalEval(localInterp, Tcl_DStringValue(&request)); + result = Tcl_EvalEx(localInterp, Tcl_DStringValue(&request), -1, TCL_EVAL_GLOBAL); Tcl_DStringFree(&request); } if (interp != localInterp) { @@ -1565,7 +1565,7 @@ SendEventProc( remoteInterp = riPtr->interp; Tcl_Preserve(remoteInterp); - result = Tcl_GlobalEval(remoteInterp, script); + result = Tcl_EvalEx(remoteInterp, script, -1, TCL_EVAL_GLOBAL); /* * The call to Tcl_Release may have released the interpreter which diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index eb183bd..1ae8602 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -6275,7 +6275,7 @@ TkWmProtocolEventProc( Tcl_Preserve(protPtr); interp = protPtr->interp; Tcl_Preserve(interp); - result = Tcl_GlobalEval(interp, protPtr->command); + result = Tcl_EvalEx(interp, protPtr->command, -1, TCL_EVAL_GLOBAL); if (result != TCL_OK) { Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( "\n (command for \"%s\" window manager protocol)", |