Set empty usage field for commands that do not need parameters

[openocd.git] / src / helper / startup.tcl

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index 4ca2cabc26b91df3491aeba99871e597e4f113b6..cda3a8fa334dda1f031a57ffb46d63c7eb8277e6 100644 (file)
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -3,24 +3,20 @@
 # Embedded into OpenOCD executable
 #
 
-
-# We need to explicitly redirect this to the OpenOCD command
-# as Tcl defines the exit proc
-proc exit {} {
-       ocd_throw 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 {