projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dsp5680xx_cherry' of git://repo.or.cz/openocd/dsp568013 into HEAD
[fw/openocd]
/
src
/
helper
/
startup.tcl
diff --git
a/src/helper/startup.tcl
b/src/helper/startup.tcl
index cb5fb026205d603f9916af615e6cd1d638b7f11e..e2ea27d0a466808ac9644ab0d5c9b70f09d0f175 100644
(file)
--- a/
src/helper/startup.tcl
+++ b/
src/helper/startup.tcl
@@
-15,17
+15,18
@@
proc exit {} {
# to discard 'handler' command output,
proc ocd_bouncer {name args} {
set cmd [format "ocd_%s" $name]
# to discard 'handler' command output,
proc ocd_bouncer {name args} {
set cmd [format "ocd_%s" $name]
- set type [eval command type $cmd $args]
+ 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 {
if {$type == "native"} {
return [eval $cmd $args]
} else {if {$type == "simple"} {
if {[catch {eval $cmd $args}] == 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"} {
}
} else {if {$type == "group"} {
- catch {eval
help
$name $args}
+ catch {eval
ocd_usage
$name $args}
set errmsg [format "%s: command requires more arguments" \
[concat $name " " $args]]
} else {
set errmsg [format "%s: command requires more arguments" \
[concat $name " " $args]]
} else {
@@
-52,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"
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} {
proc script {filename} {
- source [find $filename]
+
uplevel #0
source [find $filename]
}
add_help_text script "filename of OpenOCD script (tcl) to run"
add_usage_text script "<file>"
#########
}
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
-}