helper/startup.tcl: remove proc exit

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

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index d1c73ef3f2a188f1e05d91dd7393bda8f4cf94cb..cda3a8fa334dda1f031a57ffb46d63c7eb8277e6 100644 (file)
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -3,35 +3,34 @@
 # 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"} {
-               if {[catch {eval $cmd $args}] == 0} {
+               set errcode [catch {uplevel $skiplevel $cmd $args}]
+               if {$errcode == 0} {
                        return ""
                } else {
-                       set errmsg "Command handler execution failed"
+                       # 'classic' commands output error message as part of progress output
+                       set errmsg ""
                }
        } else {if {$type == "group"} {
                catch {eval ocd_usage $name $args}
                set errmsg [format "%s: command requires more arguments" \
                        [concat $name " " $args]]
        } else {
-               set errmsg [format "Unknown command type: %s" $type]
+               set errmsg [format "invalid subcommand \"%s\"" $args]
        }}}
-       return -code error $errmsg
+       return -code $errcode $errmsg
 }
 
 # Try flipping / and \ to find file if the filename does not
@@ -52,19 +51,12 @@ proc find {filename} {
 add_usage_text find "<file>"
 add_help_text find "print full path to file according to OpenOCD search rules"
 
-# Run script
+# Find and run a script
 proc script {filename} {
-       source [find $filename]
+       uplevel #0 [list source [find $filename]]
 }
 add_help_text script "filename of OpenOCD script (tcl) to run"
 add_usage_text script "<file>"
 
 #########
 
-# catch any exceptions, capture output and return output
-proc capture_catch {a} {
-       catch {
-               capture {uplevel $a}
-       } result
-       return $result
-}