X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhelper%2Fcommand.c;h=fd5e5f94822a88b0c061b2b5e7a1914ad32b7fda;hb=690e054a3d8c8847432c31224743b0f9dbd0f1bf;hp=5a68208a6ae421e2c791a6ff1d7092a19f83e1a8;hpb=559d08c19ed838f7bb2a77ce56a5a274641111f8;p=openocd

diff --git a/src/helper/command.c b/src/helper/command.c
index 5a68208a..fd5e5f94 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -144,11 +144,6 @@ void script_debug(Jim_Interp *interp, const char *name,
 	{
 		int len;
 		const char *w = Jim_GetString(argv[i], &len);
-
-		/* end of line comment? */
-		if (*w == '#')
-			break;
-
 		char * t = alloc_printf("%s %s", dbg, w);
 		free (dbg);
 		dbg = t;
@@ -175,10 +170,6 @@ static const char **script_command_args_alloc(
 	{
 		int len;
 		const char *w = Jim_GetString(argv[i], &len);
-		/* a comment may end the line early */
-		if (*w == '#')
-			break;
-
 		words[i] = strdup(w);
 		if (words[i] == NULL)
 		{
@@ -777,12 +768,16 @@ static int jim_find(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	return JIM_OK;
 }
 
-static int jim_echo(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+COMMAND_HANDLER(jim_echo)
 {
-	if (argc != 2)
+	if (CMD_ARGC == 2 && !strcmp(CMD_ARGV[0], "-n"))
+	{
+		LOG_USER_N("%s", CMD_ARGV[1]);
+		return JIM_OK;
+	}
+	if (CMD_ARGC != 1)
 		return JIM_ERR;
-	const char *str = Jim_GetString(argv[1], NULL);
-	LOG_USER("%s", str);
+	LOG_USER("%s", CMD_ARGV[0]);
 	return JIM_OK;
 }
 
@@ -1254,6 +1249,15 @@ static const struct command_registration command_subcommand_handlers[] = {
 };
 
 static const struct command_registration command_builtin_handlers[] = {
+	{
+		.name = "echo",
+		.handler = jim_echo,
+		.mode = COMMAND_ANY,
+		.help = "Logs a message at \"user\" priority. "
+			"Output message to stdout. "
+			"Option \"-n\" suppresses trailing newline",
+		.usage = "[-n] string",
+	},
 	{
 		.name = "add_help_text",
 		.handler = handle_help_add_command,
@@ -1357,7 +1361,6 @@ struct command_context* command_init(const char *startup_tcl, Jim_Interp *interp
 			Jim_NewStringObj(interp, HostOs , strlen(HostOs)));
 
 	Jim_CreateCommand(interp, "ocd_find", jim_find, NULL, NULL);
-	Jim_CreateCommand(interp, "echo", jim_echo, NULL, NULL);
 	Jim_CreateCommand(interp, "capture", jim_capture, NULL, NULL);
 
 	register_commands(context, NULL, command_builtin_handlers);