X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Fcommand.c;h=dcad6a198e39ff9de78f6a740263f66af2ece812;hb=330733eadf76ea87ee8714ed7958f174b1be21db;hp=9b9c5ec0ee34f2ed16fbc6e6c8bd09b7ea0f5f03;hpb=8fc5a9a5e90ba1c7580e9d883aed0d790e594c8e;p=openocd.git

diff --git a/src/helper/command.c b/src/helper/command.c
index 9b9c5ec0ee..dcad6a198e 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -565,8 +565,16 @@ static int run_command(struct command_context *context,
 {
 	if (!command_can_run(context, c))
 	{
-		/* Config commands can not run after the config stage */
-		LOG_ERROR("The '%s' command must be used before 'init'.", c->name);
+		/* Many commands may be run only before/after 'init' */
+		const char *when;
+		switch (c->mode) {
+		case COMMAND_CONFIG: when = "before"; break;
+		case COMMAND_EXEC: when = "after"; break;
+		// handle the impossible with humor; it guarantees a bug report!
+		default: when = "if Cthulhu is summoned by"; break;
+		}
+		LOG_ERROR("The '%s' command must be used %s 'init'.",
+				c->name, when);
 		return ERROR_FAIL;
 	}