X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fstartup.tcl;h=4ca2cabc26b91df3491aeba99871e597e4f113b6;hp=cb5fb026205d603f9916af615e6cd1d638b7f11e;hb=19f219f731f29503c8e4d432935d3ea558cc1659;hpb=df22f0f9ca4ebf881adf8d20cb63e64139f18613;ds=sidebyside

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index cb5fb02620..4ca2cabc26 100644
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -15,23 +15,26 @@ proc exit {} {
 # 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]
+	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 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
@@ -52,19 +55,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
-}