diff options
| author | dgp <dgp@users.sourceforge.net> | 2000-12-11 04:17:38 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2000-12-11 04:17:38 (GMT) |
| commit | ab4eb3fe6a6e7f494057f9bc9af0c1a4489c5f88 (patch) | |
| tree | 3558459e0bea4593330821ed820ea77f36f43326 /library/init.tcl | |
| parent | 19df5d993a9f6e55e773ea93d3632c770756358b (diff) | |
| download | tcl-ab4eb3fe6a6e7f494057f9bc9af0c1a4489c5f88.zip tcl-ab4eb3fe6a6e7f494057f9bc9af0c1a4489c5f88.tar.gz tcl-ab4eb3fe6a6e7f494057f9bc9af0c1a4489c5f88.tar.bz2 | |
2000-12-10 Don Porter <dgp@users.sourceforge.net>
* library/init.tcl:
* library/msgcat/msgcat.tcl:
* library/msgcat/pkgIndex.tcl:
* library/opt/optparse.tcl:
* library/opt/pkgIndex.tcl: Where [uplevel] is used in a proc
to evaluate a Tcl built-in command in the caller's context,
the built-in commands are now fully namespace-qualified. This
prevents problems when the caller context is in a namespace where
the built-in command name has been used by a command in the
namespace. (For example, [::ns::set] might be called instead
of the intended [::set]). [Bug #119422, Patch #102545]
Diffstat (limited to 'library/init.tcl')
| -rw-r--r-- | library/init.tcl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/library/init.tcl b/library/init.tcl index 865db47..b6ba69f 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -3,7 +3,7 @@ # Default system startup file for Tcl-based applications. Defines # "unknown" procedure and auto-load facilities. # -# RCS: @(#) $Id: init.tcl,v 1.43 2000/12/09 00:11:54 hobbs Exp $ +# RCS: @(#) $Id: init.tcl,v 1.44 2000/12/11 04:17:38 dgp Exp $ # # Copyright (c) 1991-1993 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -165,7 +165,7 @@ proc unknown args { set cmd [lindex $args 0] if {[regexp "^namespace\[ \t\n\]+inscope" $cmd] && [llength $cmd] == 4} { set arglist [lrange $args 1 end] - set ret [catch {uplevel 1 $cmd $arglist} result] + set ret [catch {uplevel 1 ::$cmd $arglist} result] if {$ret == 0} { return $result } else { @@ -188,7 +188,7 @@ proc unknown args { return -code error "self-referential recursion in \"unknown\" for command \"$name\""; } set unknown_pending($name) pending; - set ret [catch {auto_load $name [uplevel 1 {namespace current}]} msg] + set ret [catch {auto_load $name [uplevel 1 {::namespace current}]} msg] unset unknown_pending($name); if {$ret != 0} { append errorInfo "\n (autoloading \"$name\")" @@ -286,7 +286,7 @@ proc auto_load {cmd {namespace {}}} { global auto_index auto_oldpath auto_path if {[string length $namespace] == 0} { - set namespace [uplevel 1 [list namespace current]] + set namespace [uplevel 1 [list ::namespace current]] } set nameList [auto_qualify $cmd $namespace] # workaround non canonical auto_index entries that might be around @@ -461,7 +461,7 @@ proc auto_import {pattern} { return } - set ns [uplevel 1 [list namespace current]] + set ns [uplevel 1 [list ::namespace current]] set patternList [auto_qualify $pattern $ns] auto_load_index |