aboutsummaryrefslogtreecommitdiff
path: root/src/helper/startup.tcl
diff options
context:
space:
mode:
Diffstat (limited to 'src/helper/startup.tcl')
-rw-r--r--src/helper/startup.tcl9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index 4ca2cab..2578de9 100644
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -12,15 +12,18 @@ proc exit {} {
# All commands are registered with an 'ocd_' prefix, while the "real"
# command is a wrapper that calls this function. Its primary purpose is
-# to discard 'handler' command output,
+# to discard 'handler' command output.
+# Due to the two nested proc calls, this wrapper has to explicitly run
+# the wrapped command in the stack frame two levels above.
proc ocd_bouncer {name args} {
set cmd [format "ocd_%s" $name]
set type [eval ocd_command type $cmd $args]
set errcode error
+ set skiplevel [expr [eval info level] > 1 ? 2 : 1]
if {$type == "native"} {
- return [eval $cmd $args]
+ return [uplevel $skiplevel $cmd $args]
} else {if {$type == "simple"} {
- set errcode [catch {eval $cmd $args}]
+ set errcode [catch {uplevel $skiplevel $cmd $args}]
if {$errcode == 0} {
return ""
} else {