diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2022-12-19 00:01:00 +0100 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2023-03-25 18:09:35 +0000 |
| commit | 1ec8b83cbdb407536966b4e455dbb39d1cb42b3a (patch) | |
| tree | 760cf489336be59aea9d20ab362c8ea7ac20cd6f /src/helper/command.c | |
| parent | 5f6ceebbba3a34fc4bfcf56e963739dd2e9cf056 (diff) | |
| download | riscv-openocd-1ec8b83cbdb407536966b4e455dbb39d1cb42b3a.zip riscv-openocd-1ec8b83cbdb407536966b4e455dbb39d1cb42b3a.tar.gz riscv-openocd-1ec8b83cbdb407536966b4e455dbb39d1cb42b3a.tar.bz2 | |
helper: command: rewrite command 'ocd_find' as COMMAND_HANDLER
The mixed use of jim commands and OpenOCD commands is error prone
due to handling of errors through JIM_xx and ERROR_yy.
Rewrite the jim command 'ocd_find' as OpenOCD command.
Change-Id: Id775bccc12840bcf95d8c19787beda5e7c3107fc
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7484
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Tested-by: jenkins
Diffstat (limited to 'src/helper/command.c')
| -rw-r--r-- | src/helper/command.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/helper/command.c b/src/helper/command.c index b358e18..235bec8 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -662,19 +662,19 @@ void command_done(struct command_context *cmd_ctx) } /* find full path to file */ -static int jim_find(Jim_Interp *interp, int argc, Jim_Obj *const *argv) +COMMAND_HANDLER(handle_find) { - if (argc != 2) - return JIM_ERR; - const char *file = Jim_GetString(argv[1], NULL); - char *full_path = find_file(file); + if (CMD_ARGC != 1) + return ERROR_COMMAND_SYNTAX_ERROR; + + char *full_path = find_file(CMD_ARGV[0]); if (!full_path) - return JIM_ERR; - Jim_Obj *result = Jim_NewStringObj(interp, full_path, strlen(full_path)); + return ERROR_COMMAND_ARGUMENT_INVALID; + + command_print(CMD, "%s", full_path); free(full_path); - Jim_SetResult(interp, result); - return JIM_OK; + return ERROR_OK; } COMMAND_HANDLER(handle_echo) @@ -1165,7 +1165,7 @@ static const struct command_registration command_builtin_handlers[] = { { .name = "ocd_find", .mode = COMMAND_ANY, - .jim_handler = jim_find, + .handler = handle_find, .help = "find full path to file", .usage = "file", }, |