X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fcommand.c;h=55f950bf49f9df5fb02319b901240507ee632ab1;hp=ec7cc6bb7cd2e962d2f9b95ddcd0cc39ae6629eb;hb=0bb7c9d10935b320ada567dc0e46f3b23eea2793;hpb=2585fc34200938fb3fa55a450ea37f68012aafa7 diff --git a/src/helper/command.c b/src/helper/command.c index ec7cc6bb7c..55f950bf49 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -38,10 +38,16 @@ #include #include +int fast_and_dangerous = 0; + void command_print_help_line(command_context_t* context, struct command_s *command, int indent); int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); + +/* forward declaration of jim_command */ +extern int jim_command(command_context_t *context, char *line); int build_unique_lengths(command_context_t *context, command_t *commands) { @@ -140,6 +146,45 @@ command_t* register_command(command_context_t *context, command_t *parent, char return c; } +int unregister_all_commands(command_context_t *context) +{ + command_t *c, *c2; + + unique_length_dirty = 1; + + if (context == NULL) + return ERROR_OK; + + + while(NULL != context->commands) + { + c = context->commands; + + while(NULL != c->children) + { + c2 = c->children; + c->children = c->children->next; + free(c2->name); + c2->name = NULL; + free(c2->help); + c2->help = NULL; + free(c2); + c2 = NULL; + } + + context->commands = context->commands->next; + + free(c->name); + c->name = NULL; + free(c->help); + c->help = NULL; + free(c); + c = NULL; + } + + return ERROR_OK; +} + int unregister_command(command_context_t *context, char *name) { command_t *c, *p = NULL, *c2; @@ -260,6 +305,14 @@ int parse_line(char *line, char *words[], int max_words) return nwords; } +void command_output_text( command_context_t *context, const char *data ) +{ + if( context && context->output_handler && data ){ + context->output_handler( context, data ); + } +} + + void command_print_n(command_context_t *context, char *format, ...) { char *string; @@ -295,10 +348,9 @@ void command_print(command_context_t *context, char *format, ...) va_end(ap); } -int find_and_run_command(command_context_t *context, command_t *commands, char *words[], int num_words, int start_word) +command_t *find_command(command_context_t *context, command_t *commands, char *words[], int num_words, int start_word, int *new_start_word) { command_t *c; - int retval = ERROR_COMMAND_SYNTAX_ERROR; if (unique_length_dirty) { @@ -321,53 +373,67 @@ int find_and_run_command(command_context_t *context, command_t *commands, char * { if (!c->handler) { - command_print(context, "No handler for command"); - retval = ERROR_COMMAND_SYNTAX_ERROR; - break; + return NULL; } else { - int retval = c->handler(context, c->name, words + start_word + 1, num_words - start_word - 1); - if (retval == ERROR_COMMAND_SYNTAX_ERROR) - { - command_print(context, "Syntax error:"); - command_print_help_line(context, c, 0); - } else if (retval != ERROR_OK) - { - /* we do not print out an error message because the command *should* - * have printed out an error - */ - LOG_DEBUG("Command failed with error code %d", retval); - } - return retval; + *new_start_word=start_word; + return c; } } else { if (start_word == num_words - 1) { - command_print(context, "Incomplete command"); - break; + return NULL; } - return find_and_run_command(context, c->children, words, num_words, start_word + 1); + return find_command(context, c->children, words, num_words, start_word + 1, new_start_word); } } } + return NULL; +} + +int find_and_run_command(command_context_t *context, command_t *commands, char *words[], int num_words) +{ + int start_word=0; + command_t *c; + c=find_command(context, commands, words, num_words, start_word, &start_word); + if (c==NULL) + { + command_print(context, "Command %s not found", words[start_word]); + return ERROR_COMMAND_SYNTAX_ERROR; + } - command_print(context, "Command %s not found", words[start_word]); - return retval; + int retval = c->handler(context, c->name, words + start_word + 1, num_words - start_word - 1); + if (retval == ERROR_COMMAND_SYNTAX_ERROR) + { + command_print(context, "Syntax error:"); + command_print_help_line(context, c, 0); + } + else if (retval == ERROR_COMMAND_CLOSE_CONNECTION) + { + /* just fall through for a shutdown request */ + } + else if (retval != ERROR_OK) + { + /* we do not print out an error message because the command *should* + * have printed out an error + */ + LOG_DEBUG("Command failed with error code %d", retval); + } + return retval; } -int command_run_line(command_context_t *context, char *line) +int command_run_line_internal_op(command_context_t *context, char *line, int run) { + LOG_USER_N("%s", ""); /* Keep GDB connection alive*/ + int nwords; char *words[128] = {0}; int retval; int i; - - if ((!context) || (!line)) - return ERROR_INVALID_ARGUMENTS; - + /* skip preceding whitespace */ while (isspace(*line)) line++; @@ -385,7 +451,14 @@ int command_run_line(command_context_t *context, char *line) nwords = parse_line(line, words, sizeof(words) / sizeof(words[0])); if (nwords > 0) - retval = find_and_run_command(context, context->commands, words, nwords, 0); + if (run) + { + retval = find_and_run_command(context, context->commands, words, nwords); + } else + { + int t; + return (find_command(context, context->commands, words, nwords, 0, &t)!=NULL)?ERROR_OK:ERROR_FAIL; + } else return ERROR_INVALID_ARGUMENTS; @@ -395,6 +468,31 @@ int command_run_line(command_context_t *context, char *line) return retval; } +int command_run_line_internal(command_context_t *context, char *line) +{ + return command_run_line_internal_op(context, line, 1); +} + +int command_run_line(command_context_t *context, char *line) +{ + if ((!context) || (!line)) + return ERROR_INVALID_ARGUMENTS; + + if (command_run_line_internal_op(context, line, 0)!=ERROR_OK) + { + /* If we can't find a command, then try the interpreter. + * If there is no interpreter implemented, then this will + * simply print a syntax error. + * + * These hooks were left in to reduce patch size for + * wip to add scripting language. + */ + return jim_command(context, line); + } + + return command_run_line_internal(context, line); +} + int command_run_file(command_context_t *context, FILE *file, enum command_mode mode) { int retval = ERROR_OK; @@ -449,14 +547,26 @@ int command_run_file(command_context_t *context, FILE *file, enum command_mode m return retval; } +int command_run_linef(command_context_t *context, char *format, ...) +{ + int retval=ERROR_FAIL; + char *string; + va_list ap; + va_start(ap, format); + string = alloc_vprintf(format, ap); + if (string!=NULL) + { + retval=command_run_line(context, string); + } + va_end(ap); + return retval; +} + void command_print_help_line(command_context_t* context, struct command_s *command, int indent) { command_t *c; - #ifdef HAVE_C_VARRAYS - char indent_text[indent + 2]; - #else - char indent_text[68]; - #endif + char *indent_text=malloc(indent + 2); + char *help = "no help available"; char name_buf[64]; @@ -484,6 +594,7 @@ void command_print_help_line(command_context_t* context, struct command_s *comma command_print_help_line(context, c, indent + 1); } } + free(indent_text); } int command_print_help_match(command_context_t* context, command_t* c_first, char* name, char** args, int argc) @@ -518,8 +629,7 @@ int command_print_help(command_context_t* context, char* name, char** args, int return command_print_help_match(context, context->commands, name, args, argc); } - -void command_set_output_handler(command_context_t* context, int (*output_handler)(struct command_context_s *context, char* line), void *priv) +void command_set_output_handler(command_context_t* context, int (*output_handler)(struct command_context_s *context, const char* line), void *priv) { context->output_handler = output_handler; context->output_handler_priv = priv; @@ -561,6 +671,9 @@ command_context_t* command_init() register_command(context, NULL, "time", handle_time_command, COMMAND_ANY, "time - execute and print time it took"); + register_command(context, NULL, "fast", handle_fast_command, + COMMAND_ANY, "fast - place at beginning of config files. Sets defaults to fast and dangerous."); + return context; } @@ -580,6 +693,17 @@ int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **ar return ERROR_OK; } +int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +{ + if (argc!=1) + return ERROR_COMMAND_SYNTAX_ERROR; + + fast_and_dangerous = strcmp("enable", args[0])==0; + + return ERROR_OK; +} + + int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { duration_t duration; @@ -592,7 +716,7 @@ int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **arg duration_start_measure(&duration); - retval = find_and_run_command(cmd_ctx, cmd_ctx->commands, args, argc, 0); + retval = find_and_run_command(cmd_ctx, cmd_ctx->commands, args, argc); duration_stop_measure(&duration, &duration_text); @@ -604,3 +728,10 @@ int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **arg return retval; } +/* + * Local Variables: ** + * tab-width: 4 ** + * c-basic-offset: 4 ** + * End: ** + */ +