proc ocd_bouncer {name args} {
set cmd [format "ocd_%s" $name]
set type [eval ocd_command type $cmd $args]
+ set errcode error
if {$type == "native"} {
return [eval $cmd $args]
} else {if {$type == "simple"} {
- if {[catch {eval $cmd $args}] == 0} {
+ set errcode [catch {eval $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_help $name $args}
+ 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
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
-}