X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fcommand.c;h=85d9463dfc29c41f391499b9530759abf649d5d1;hp=086b03d3e0b068ade1175f1e2346b700da88ec23;hb=0535531d2753f1b86454bb6ffad6ffbdd56c66d0;hpb=ac86f4ccba49a671034a7607a7e14bc4b5e86ac6 diff --git a/src/helper/command.c b/src/helper/command.c index 086b03d3e0..85d9463dfc 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -36,6 +36,7 @@ #endif // @todo the inclusion of target.h here is a layering violation +#include #include #include "command.h" #include "configuration.h" @@ -143,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; @@ -174,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) { @@ -318,7 +310,7 @@ static void command_free(struct command *c) } if (c->name) - free(c->name); + free((void *)c->name); if (c->help) free((void*)c->help); if (c->usage) @@ -683,7 +675,8 @@ int command_run_line(struct command_context *context, char *line) if (retval != ERROR_COMMAND_CLOSE_CONNECTION) { /* We do not print the connection closed error message */ - Jim_PrintErrorMessage(interp); + Jim_MakeErrorMessage(interp); + LOG_USER("%s", Jim_GetString(Jim_GetResult(interp), NULL)); } if (retval == ERROR_OK) { @@ -713,7 +706,7 @@ int command_run_line(struct command_context *context, char *line) buff[chunk] = 0; LOG_USER_N("%s", buff); } - LOG_USER_N("%s", "\n"); + LOG_USER_N("\n"); } retval = ERROR_OK; } @@ -775,98 +768,22 @@ 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) -{ - if (argc != 2) - return JIM_ERR; - const char *str = Jim_GetString(argv[1], NULL); - LOG_USER("%s", str); - return JIM_OK; -} - -static size_t openocd_jim_fwrite(const void *_ptr, size_t size, size_t n, void *cookie) +COMMAND_HANDLER(jim_echo) { - size_t nbytes; - const char *ptr; - Jim_Interp *interp; - - /* make it a char easier to read code */ - ptr = _ptr; - interp = cookie; - nbytes = size * n; - if (ptr == NULL || interp == NULL || nbytes == 0) { - return 0; - } - - /* do we have to chunk it? */ - if (ptr[nbytes] == 0) - { - /* no it is a C style string */ - LOG_USER_N("%s", ptr); - return strlen(ptr); - } - /* GRR we must chunk - not null terminated */ - while (nbytes) { - char chunk[128 + 1]; - int x; - - x = nbytes; - if (x > 128) { - x = 128; - } - /* copy it */ - memcpy(chunk, ptr, x); - /* terminate it */ - chunk[n] = 0; - /* output it */ - LOG_USER_N("%s", chunk); - ptr += x; - nbytes -= x; - } - - return n; -} - -static size_t openocd_jim_fread(void *ptr, size_t size, size_t n, void *cookie) -{ - /* TCL wants to read... tell him no */ - return 0; -} - -static int openocd_jim_vfprintf(void *cookie, const char *fmt, va_list ap) -{ - char *cp; - int n; - Jim_Interp *interp; - - n = -1; - interp = cookie; - if (interp == NULL) - return n; - - cp = alloc_vprintf(fmt, ap); - if (cp) + if (CMD_ARGC == 2 && !strcmp(CMD_ARGV[0], "-n")) { - LOG_USER_N("%s", cp); - n = strlen(cp); - free(cp); + LOG_USER_N("%s", CMD_ARGV[1]); + return JIM_OK; } - return n; -} - -static int openocd_jim_fflush(void *cookie) -{ - /* nothing to flush */ - return 0; -} - -static char* openocd_jim_fgets(char *s, int size, void *cookie) -{ - /* not supported */ - errno = ENOTSUP; - return NULL; + if (CMD_ARGC != 1) + return JIM_ERR; + LOG_USER("%s", CMD_ARGV[0]); + return JIM_OK; } +/* Capture progress output and return as tcl return value. If the + * progress output was empty, return tcl return value. + */ static int jim_capture(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { if (argc != 2) @@ -874,9 +791,21 @@ static int jim_capture(Jim_Interp *interp, int argc, Jim_Obj *const *argv) struct log_capture_state *state = command_log_capture_start(interp); + /* disable polling during capture. This avoids capturing output + * from polling. + * + * This is necessary in order to avoid accidentially getting a non-empty + * string for tcl fn's. + */ + bool save_poll = jtag_poll_get_enabled(); + + jtag_poll_set_enabled(false); + const char *str = Jim_GetString(argv[1], NULL); int retcode = Jim_Eval_Named(interp, str, __THIS__FILE__, __LINE__); + jtag_poll_set_enabled(save_poll); + command_log_capture_finish(state); return retcode; @@ -931,8 +860,7 @@ static void command_help_show_wrap(const char *str, unsigned n, unsigned n2) if (next - last < HELP_LINE_WIDTH(n)) cp = next; command_help_show_indent(n); - LOG_USER_N("%.*s", (int)(cp - last), last); - LOG_USER_N("\n"); + LOG_USER("%.*s", (int)(cp - last), last); last = cp + 1; n = n2; } @@ -940,9 +868,6 @@ static void command_help_show_wrap(const char *str, unsigned n, unsigned n2) static COMMAND_HELPER(command_help_show, struct command *c, unsigned n, bool show_help, const char *match) { - if (!command_can_run(CMD_CTX, c)) - return ERROR_OK; - char *cmd_name = command_name(c, ' '); if (NULL == cmd_name) return -ENOMEM; @@ -1323,6 +1248,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, @@ -1387,11 +1321,11 @@ struct command_context* command_init(const char *startup_tcl, Jim_Interp *interp /* Create a jim interpreter if we were not handed one */ if (interp == NULL) { - Jim_InitEmbedded(); /* Create an interpreter */ interp = Jim_CreateInterp(); /* Add all the Jim core commands */ Jim_RegisterCoreCommands(interp); + Jim_InitStaticExtensions(interp); } #endif context->interp = interp; @@ -1426,29 +1360,16 @@ 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); - /* Set Jim's STDIO */ - interp->cookie_stdin = interp; - interp->cookie_stdout = interp; - interp->cookie_stderr = interp; - interp->cb_fwrite = openocd_jim_fwrite; - interp->cb_fread = openocd_jim_fread ; - interp->cb_vfprintf = openocd_jim_vfprintf; - interp->cb_fflush = openocd_jim_fflush; - interp->cb_fgets = openocd_jim_fgets; - register_commands(context, NULL, command_builtin_handlers); -#if !BUILD_ECOSBOARD - Jim_EventLoopOnLoad(interp); -#endif Jim_SetAssocData(interp, "context", NULL, context); if (Jim_Eval_Named(interp, startup_tcl, "embedded:startup.tcl",1) == JIM_ERR) { LOG_ERROR("Failed to run startup.tcl (embedded into OpenOCD)"); - Jim_PrintErrorMessage(interp); + Jim_MakeErrorMessage(interp); + LOG_USER_N("%s", Jim_GetString(Jim_GetResult(interp), NULL)); exit(-1); } Jim_DeleteAssocData(interp, "context");