cfi: fix cfi arch check regression

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

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index f11d5b6838aa27b3b95f4a087671d905915737ac..a7c0d5844f8523031e0c612d70c9c59ec990364d 100644 (file)
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -10,6 +10,31 @@ 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,
+proc ocd_bouncer {name args} {
+       set cmd [format "ocd_%s" $name]
+       set type [eval ocd_command type $cmd $args]
+       if {$type == "native"} {
+               return [eval $cmd $args]
+       } else {if {$type == "simple"} {
+               if {[catch {eval $cmd $args}] == 0} {
+                       return ""
+               } else {
+                       # '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]
+       }}}
+       return -code error $errmsg
+}
+
 # Try flipping / and \ to find file if the filename does not
 # match the precise spelling
 proc find {filename} {
@@ -28,19 +53,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
-}