diff options
| author | Tim Newsome <tim@sifive.com> | 2023-10-16 12:30:06 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2023-10-16 12:30:06 -0700 |
| commit | 53fcf14d83481c6713396dfe8e30067c3c82cac1 (patch) | |
| tree | 94a4d86ae529a3a574485f00f5bf806f0d716607 /src/openocd.c | |
| parent | e1fa78d1b368bfd0c9493897da4052534778c79e (diff) | |
| parent | 0384fe5d596f42388f8b84d42959d899f29388ab (diff) | |
| download | riscv-openocd-53fcf14d83481c6713396dfe8e30067c3c82cac1.zip riscv-openocd-53fcf14d83481c6713396dfe8e30067c3c82cac1.tar.gz riscv-openocd-53fcf14d83481c6713396dfe8e30067c3c82cac1.tar.bz2 | |
Merge commit '0384fe5d596f42388f8b84d42959d899f29388ab' into from_upstream
Conflicts:
.github/workflows/snapshot.yml
src/rtos/FreeRTOS.c
Change-Id: I4c9ff887b69140e0f61cb3f75a2f2c1a12071320
Diffstat (limited to 'src/openocd.c')
| -rw-r--r-- | src/openocd.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/openocd.c b/src/openocd.c index 875da5a..54c5eb3 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -51,24 +51,23 @@ static const char openocd_startup_tcl[] = { }; /* Give scripts and TELNET a way to find out what version this is */ -static int jim_version_command(Jim_Interp *interp, int argc, - Jim_Obj * const *argv) +COMMAND_HANDLER(handler_version_command) { - if (argc > 2) - return JIM_ERR; - const char *str = ""; - char *version_str; - version_str = OPENOCD_VERSION; + char *version_str = OPENOCD_VERSION; - if (argc == 2) - str = Jim_GetString(argv[1], NULL); + if (CMD_ARGC > 1) + return ERROR_COMMAND_SYNTAX_ERROR; + + if (CMD_ARGC == 1) { + if (strcmp("git", CMD_ARGV[0])) + return ERROR_COMMAND_ARGUMENT_INVALID; - if (strcmp("git", str) == 0) version_str = GITVERSION; + } - Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1)); + command_print(CMD, "%s", version_str); - return JIM_OK; + return ERROR_OK; } static int log_target_callback_event_handler(struct target *target, @@ -194,9 +193,10 @@ COMMAND_HANDLER(handle_add_script_search_dir_command) static const struct command_registration openocd_command_handlers[] = { { .name = "version", - .jim_handler = jim_version_command, + .handler = handler_version_command, .mode = COMMAND_ANY, .help = "show program version", + .usage = "[git]", }, { .name = "noinit", |