auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Added TARGET_REQ_DEBUGCHAR target_request debugmsg. This

Browse Source 
provides a better impeadance match for debug output char fn's, e.g. eCos.
- Line endings are now added at the caller site of command_print*(). command_print()
  still adds a line ending
- echo of commands in scripts are now available via debug_level instead of
  forced echo
- Added a USER_SAMELINE() for printing without a lineend.


git-svn-id: svn://svn.berlios.de/openocd/trunk@364 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe
2008-02-28 08:11:18 +00:00
parent b70e262867
commit 0689e3dd67
9 changed files with 112 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/helper/command.c
View File

@@ -260,7 +260,7 @@ int parse_line(char *line, char *words[], int max_words)
return nwords;
}
void command_print(command_context_t *context, char *format, ...)
static void command_printv(command_context_t *context, char *format, va_list ap)
{
char *buffer = NULL;
int n, size = 0;
@@ -269,8 +269,6 @@ void command_print(command_context_t *context, char *format, ...)
/* process format string */
for (;;)
{
va_list ap;
va_start(ap, format);
if (!buffer || (n = vsnprintf(buffer, size, format, ap)) >= size)
{
/* increase buffer until it fits the whole string */
@@ -279,16 +277,13 @@ void command_print(command_context_t *context, char *format, ...)
/* gotta free up */
if (buffer)
free(buffer);
va_end(ap);
return;
}
buffer = p;
va_end(ap);
continue;
}
va_end(ap);
break;
}
@@ -300,25 +295,33 @@ void command_print(command_context_t *context, char *format, ...)
return;
}
p = buffer;
/* process lines in buffer */
do {
char *next = strchr(p, '\n');
if (next)
*next++ = 0;
if (context->output_handler)
context->output_handler(context, p);
p = next;
} while (p);
context->output_handler(context, buffer);
if (buffer)
free(buffer);
}
void command_print_sameline(command_context_t *context, char *format, ...)
{
va_list ap;
va_start(ap, format);
command_printv(context, format, ap);
va_end(ap);
}
void command_print(command_context_t *context, char *format, ...)
{
char *t=malloc(strlen(format)+2);
strcpy(t, format);
strcat(t, "\n");
va_list ap;
va_start(ap, format);
command_printv(context, t, ap);
va_end(ap);
free(t);
}
int find_and_run_command(command_context_t *context, command_t *commands, char *words[], int num_words, int start_word)
{
command_t *c;
@@ -396,10 +399,7 @@ int command_run_line(command_context_t *context, char *line)
if (*line && (line[0] == '#'))
return ERROR_OK;
if (context->echo)
{
command_print(context, "%s", line);
}
DEBUG("%s", line);
nwords = parse_line(line, words, sizeof(words) / sizeof(words[0]));
@@ -550,7 +550,6 @@ command_context_t* command_init()
context->mode = COMMAND_EXEC;
context->commands = NULL;
context->current_target = 0;
context->echo = 0;
context->output_handler = NULL;
context->output_handler_priv = NULL;