server: shutdown command should lead to exit without evaluating the rest

paulfertser · nattgris · commit a35712a85c42 · 2015-02-11T22:18:33.000Z
Currently openocd -c "echo a1; shutdown; echo a2" outputs both "a1" and "a2" and only then shuts down. This patch fixes it by making shutdown command throw an exception, so unless it's caught the shutdown will behave as expected. Change-Id: I764268b3a9046ff3e9717d04095ea0673f1d755a Signed-off-by: Paul Fertser <fercerpav@gmail.com> Reviewed-on: http://openocd.zylin.com/2511 Tested-by: jenkins Reviewed-by: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
diff --git a/src/server/server.c b/src/server/server.c
@@ -589,7 +589,7 @@ COMMAND_HANDLER(handle_shutdown_command)
 
 	shutdown_openocd = 1;
 
-	return ERROR_OK;
+	return ERROR_COMMAND_CLOSE_CONNECTION;
 }
 
 COMMAND_HANDLER(handle_poll_period_command)

Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,7 @@ COMMAND_HANDLER(handle_shutdown_command)`
`589`	`589`
`590`	`590`	`shutdown_openocd = 1;`
`591`	`591`
`592`		`- return ERROR_OK;`
	`592`	`+ return ERROR_COMMAND_CLOSE_CONNECTION;`
`593`	`593`	`}`
`594`	`594`
`595`	`595`	`COMMAND_HANDLER(handle_poll_period_command)`