zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix broken -c/f options where it would silently terminate for scripts that did not set the return value. 

git-svn-id: svn://svn.berlios.de/openocd/trunk@1246 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
oharboe 2008-12-16 10:22:24 +00:00
parent 0748b5ad4c
commit 498c87bf02
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/helper/command.c
View File

@ -290,9 +290,9 @@ int unregister_command(command_context_t *context, char *name)
/* find command */ /* find command */
c = context->commands; c = context->commands;
while(NULL != c) while(NULL != c)
{ {
if (strcmp(name, c->name) == 0) if (strcmp(name, c->name) == 0)
{ {
/* unlink command */ /* unlink command */
@ -305,7 +305,7 @@ int unregister_command(command_context_t *context, char *name)
/* first element in command list */ /* first element in command list */
context->commands = c->next; context->commands = c->next;
} }
/* unregister children */ /* unregister children */
while(NULL != c->children) while(NULL != c->children)
{ {
@ -316,7 +316,7 @@ int unregister_command(command_context_t *context, char *name)
free(c2); free(c2);
c2 = NULL; c2 = NULL;
} }
/* delete command */ /* delete command */
free(c->name); free(c->name);
c->name = NULL; c->name = NULL;
@ -324,7 +324,7 @@ int unregister_command(command_context_t *context, char *name)
c = NULL; c = NULL;
return ERROR_OK; return ERROR_OK;
} }
/* remember the last command for unlinking */ /* remember the last command for unlinking */
p = c; p = c;
c = c->next; c = c->next;
@ -479,21 +479,20 @@ int command_run_line(command_context_t *context, char *line)
int reslen; int reslen;
result = Jim_GetString(Jim_GetResult(interp), &reslen); result = Jim_GetString(Jim_GetResult(interp), &reslen);
if (reslen) { int i;
int i; char buff[256+1];
char buff[256+1]; for (i = 0; i < reslen; i += 256)
for (i = 0; i < reslen; i += 256) {
{ int chunk;
int chunk; chunk = reslen - i;
chunk = reslen - i; if (chunk > 256)
if (chunk > 256) chunk = 256;
chunk = 256; strncpy(buff, result+i, chunk);
strncpy(buff, result+i, chunk); buff[chunk] = 0;
buff[chunk] = 0; LOG_USER_N("%s", buff);
LOG_USER_N("%s", buff);
}
LOG_USER_N("%s", "\n");
} }
LOG_USER_N("%s", "\n");
retval=ERROR_OK;
} }
return retval; return retval;
} }