Tcl exception codes cleanup, shutdown command amendments

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

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index ede8cdb9cfd75e03ae549239f998a1905a5ab8ae..4ca2cabc26b91df3491aeba99871e597e4f113b6 100644 (file)
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -10,38 +10,31 @@ proc exit {} {
        ocd_throw exit
 }
 
-# Help text list. A list of command + help text pairs.
-proc cmd_help {cmdname h indent} {
-       set indent [expr $indent * 2]
-
-       set fmt_str [format "%%%ds%%-%ds %%s" $indent [expr 25 - $indent]]
-       set w [expr 50 - $indent]
-       set n 0
-
-       while 1 {
-               if {$n > [string length $h]} {break}
-
-               set next_a [expr $n + $w]
-               if {[string length $h] > $n + $w} \
-               {
-                       set xxxx [string range $h $n [expr $n + $w]]
-                       for {set lastpos [expr [string length $xxxx] - 1]} \
-                               {$lastpos >= 0 && [string compare \
-                                       [string range $xxxx $lastpos $lastpos] " "] != 0} \
-                               {set lastpos [expr $lastpos - 1]} \
-                       {
-                       }
-                       #set next_a -1
-                       if {$lastpos != -1} {
-                               set next_a [expr $lastpos + $n + 1]
-                       }
+# 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]
+       set errcode error
+       if {$type == "native"} {
+               return [eval $cmd $args]
+       } else {if {$type == "simple"} {
+               set errcode [catch {eval $cmd $args}]
+               if {$errcode == 0} {
+                       return ""
+               } else {
+                       # 'classic' commands output error message as part of progress output
+                       set errmsg ""
                }
-
-               puts [format $fmt_str "" $cmdname \
-                               [string range $h $n [expr $next_a - 1]] ]
-               set cmdname ""
-               set n [expr $next_a]
-       }
+       } 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 "invalid subcommand \"%s\"" $args]
+       }}}
+       return -code $errcode $errmsg
 }
 
 # Try flipping / and \ to find file if the filename does not
@@ -59,21 +52,15 @@ proc find {filename} {
        # make sure error message matches original input string
        return -code error "Can't find $filename"
 }
-add_help_text find "<file> - 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} {
-       source [find $filename]
+       uplevel #0 [list source [find $filename]]
 }
-
-add_help_text script "<filename> - filename of OpenOCD script (tcl) to run"
+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
-}