X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Fcommand.c;h=bc1fb348941681918bb12d58c655400967169046;hb=498c87bf02aaaa6cf0f7305ee2c77c7180fb8c16;hp=9ade320c669bfdc3442a290d1622fa094df73cfc;hpb=358b472ab8b531d31d0978a892408378f5c820b4;p=openocd.git

diff --git a/src/helper/command.c b/src/helper/command.c
index 9ade320c66..bc1fb34894 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -64,7 +64,6 @@ static void tcl_output(void *privData, const char *file, int line, const char *f
 
 extern command_context_t *global_cmd_ctx;
 
-
 static int script_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
 	/* the private data is stashed in the interp structure */
@@ -75,10 +74,20 @@ static int script_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	int nwords;
 	char **words;
 
+	/* DANGER!!!! be careful what we invoke here, since interp->cmdPrivData might
+	 * get overwritten by running other Jim commands! Treat it as an
+	 * emphemeral global variable that is used in lieu of an argument
+	 * to the fn and fish it out manually.
+	 */
+	c = interp->cmdPrivData;
+	if (c==NULL)
+	{
+		LOG_ERROR("BUG: interp->cmdPrivData==NULL");
+		return JIM_ERR;
+	}
 	target_call_timer_callbacks_now();
 	LOG_USER_N("%s", ""); /* Keep GDB connection alive*/
 
-	c = interp->cmdPrivData;
 	LOG_DEBUG("script_command - %s", c->name);
 
 	words = malloc(sizeof(char *) * argc);
@@ -138,6 +147,9 @@ static int script_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	return (retval==ERROR_OK)?JIM_OK:JIM_ERR;
 }
 
+/* nice short description of source file */
+#define __THIS__FILE__ "command.c"
+
 command_t* register_command(command_context_t *context, command_t *parent, char *name, int (*handler)(struct command_context_s *context, char* name, char** args, int argc), enum command_mode mode, char *help)
 {
 	command_t *c, *p;
@@ -213,13 +225,13 @@ command_t* register_command(command_context_t *context, command_t *parent, char
 
 	/* we now need to add an overrideable proc */
 	const char *override_name=alloc_printf("proc %s%s%s {args} {if {[catch {eval \"ocd_%s%s%s $args\"}]==0} {return \"\"} else { return -code error }", t1, t2, t3, t1, t2, t3);
-	Jim_Eval_Named(interp, override_name, __FILE__, __LINE__ );
+	Jim_Eval_Named(interp, override_name, __THIS__FILE__, __LINE__ );
 	free((void *)override_name);
 
 	/* accumulate help text in Tcl helptext list.  */
-    Jim_Obj *helptext=Jim_GetGlobalVariableStr(interp, "ocd_helptext", JIM_ERRMSG);
-    if (Jim_IsShared(helptext))
-        helptext = Jim_DuplicateObj(interp, helptext);
+	Jim_Obj *helptext=Jim_GetGlobalVariableStr(interp, "ocd_helptext", JIM_ERRMSG);
+	if (Jim_IsShared(helptext))
+		helptext = Jim_DuplicateObj(interp, helptext);
 	Jim_Obj *cmd_entry=Jim_NewListObj(interp, NULL, 0);
 
 	Jim_Obj *cmd_list=Jim_NewListObj(interp, NULL, 0);
@@ -277,7 +289,9 @@ int unregister_command(command_context_t *context, char *name)
 		return ERROR_INVALID_ARGUMENTS;
 
 	/* find command */
-	for (c = context->commands; c; c = c->next)
+	c = context->commands;
+
+	while(NULL != c)
 	{
 		if (strcmp(name, c->name) == 0)
 		{
@@ -288,26 +302,32 @@ int unregister_command(command_context_t *context, char *name)
 			}
 			else
 			{
+				/* first element in command list */
 				context->commands = c->next;
 			}
 
 			/* unregister children */
-			if (c->children)
+			while(NULL != c->children)
 			{
-				for (c2 = c->children; c2; c2 = c2->next)
-				{
-					free(c2->name);
-					free(c2);
-				}
+				c2 = c->children;
+				c->children = c->children->next;
+				free(c2->name);
+				c2->name = NULL;
+				free(c2);
+				c2 = NULL;
 			}
 
 			/* delete command */
 			free(c->name);
+			c->name = NULL;
 			free(c);
+			c = NULL;
+			return ERROR_OK;
 		}
 
 		/* remember the last command for unlinking */
 		p = c;
+		c = c->next;
 	}
 
 	return ERROR_OK;
@@ -336,8 +356,8 @@ void command_print_n(command_context_t *context, char *format, ...)
 		 * The latter bit isn't precisely neat, but will do for now.
 		 */
 		LOG_USER_N("%s", string);
-		// We already printed it above
-		//command_output_text(context, string);
+		/* We already printed it above */
+		/* command_output_text(context, string); */
 		free(string);
 	}
 
@@ -361,8 +381,8 @@ void command_print(command_context_t *context, char *format, ...)
 		 * The latter bit isn't precisely neat, but will do for now.
 		 */
 		LOG_USER_N("%s", string);
-		// We already printed it above
-		//command_output_text(context, string);
+		/* We already printed it above */
+		/* command_output_text(context, string); */
 		free(string);
 	}
 
@@ -433,7 +453,7 @@ int command_run_line(command_context_t *context, char *line)
 		retcode = Jim_SetAssocData(interp, "retval", NULL, &retval);
 		if (retcode == JIM_OK)
 		{
-			retcode = Jim_Eval_Named(interp, line, __FILE__, __LINE__ );
+			retcode = Jim_Eval_Named(interp, line, __THIS__FILE__, __LINE__ );
 
 			Jim_DeleteAssocData(interp, "retval");
 		}
@@ -459,21 +479,20 @@ int command_run_line(command_context_t *context, char *line)
 		int reslen;
 
 		result = Jim_GetString(Jim_GetResult(interp), &reslen);
-		if (reslen) {
-			int i;
-			char buff[256+1];
-			for (i = 0; i < reslen; i += 256)
-			{
-				int chunk;
-				chunk = reslen - i;
-				if (chunk > 256)
-					chunk = 256;
-				strncpy(buff, result+i, chunk);
-				buff[chunk] = 0;
-				LOG_USER_N("%s", buff);
-			}
-			LOG_USER_N("%s", "\n");
+		int i;
+		char buff[256+1];
+		for (i = 0; i < reslen; i += 256)
+		{
+			int chunk;
+			chunk = reslen - i;
+			if (chunk > 256)
+				chunk = 256;
+			strncpy(buff, result+i, chunk);
+			buff[chunk] = 0;
+			LOG_USER_N("%s", buff);
 		}
+		LOG_USER_N("%s", "\n");
+		retval=ERROR_OK;
 	}
 	return retval;
 }
@@ -624,7 +643,6 @@ static char* openocd_jim_fgets(char *s, int size, void *cookie)
 	return NULL;
 }
 
-
 static int jim_capture(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
 	if (argc != 2)
@@ -639,7 +657,7 @@ static int jim_capture(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 
 	log_add_callback(tcl_output, tclOutput);
 
-	retcode = Jim_Eval_Named(interp, str, __FILE__, __LINE__ );
+	retcode = Jim_Eval_Named(interp, str, __THIS__FILE__, __LINE__ );
 
 	log_remove_callback(tcl_output, tclOutput);
 
@@ -653,7 +671,7 @@ static int jim_capture(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 command_context_t* command_init()
 {
 	command_context_t* context = malloc(sizeof(command_context_t));
-	extern unsigned const char startup_tcl[];
+	extern const char startup_tcl[];
 
 	context->mode = COMMAND_EXEC;
 	context->commands = NULL;
@@ -781,7 +799,7 @@ void register_jim(struct command_context_s *cmd_ctx, const char *name, int (*cmd
 	Jim_CreateCommand(interp, name, cmd, NULL, NULL);
 
 	/* FIX!!! it would be prettier to invoke add_help_text...
-	   accumulate help text in Tcl helptext list.  */
+	 * accumulate help text in Tcl helptext list.  */
 	Jim_Obj *helptext=Jim_GetGlobalVariableStr(interp, "ocd_helptext", JIM_ERRMSG);
 	if (Jim_IsShared(helptext))
 		helptext = Jim_DuplicateObj(interp, helptext);
@@ -795,3 +813,15 @@ void register_jim(struct command_context_s *cmd_ctx, const char *name, int (*cmd
 	Jim_ListAppendElement(interp, cmd_entry, Jim_NewStringObj(interp, help, -1));
 	Jim_ListAppendElement(interp, helptext, cmd_entry);
 }
+
+/* return global variable long value or 0 upon failure */
+long jim_global_long(const char *variable)
+{
+	Jim_Obj *objPtr=Jim_GetGlobalVariableStr(interp, variable, JIM_ERRMSG);
+	long t;
+	if (Jim_GetLong(interp, objPtr, &t)==JIM_OK)
+	{
+		return t;
+	}
+	return 0;
+}