helper: command.c cleanup

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

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index dda89c8adc6cccf09f2c427d1dff99159aae0076..a7c0d5844f8523031e0c612d70c9c59ec990364d 100644 (file)
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -22,10 +22,11 @@ proc ocd_bouncer {name args} {
                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"} {
-               catch {eval ocd_help $name $args}
+               catch {eval ocd_usage $name $args}
                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"
 
-# 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
-}