X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fhelper%2Finterpreter.c;h=c5c38b83bccb65fe2c2e95e3c2a918b8c7206f1f;hb=95df797b2e711286e3909a7d25e36519d5a6e335;hp=7b0432abc097a68191b142a8ab88ed734370eada;hpb=a582e9a8d183c56d1aa8ae18afc1c11e2cbd6d2d;p=openocd.git diff --git a/src/helper/interpreter.c b/src/helper/interpreter.c index 7b0432abc0..c5c38b83bc 100644 --- a/src/helper/interpreter.c +++ b/src/helper/interpreter.c @@ -22,6 +22,7 @@ #endif #include "interpreter.h" +#include "configuration.h" #include "binarybuffer.h" #include @@ -92,7 +93,7 @@ var_t* get_var_by_namenum(char *namenum) } -int field_le_to_host(u8 *buffer, void *priv) +int field_le_to_host(u8 *buffer, void *priv, struct scan_field_s *dummy) { var_field_t *field = priv; field->value = buf_get_u32(buffer, 0, field->num_bits); @@ -221,7 +222,8 @@ int handle_script_command(struct command_context_s *cmd_ctx, char *cmd, char **a if (argc != 1) command_print(cmd_ctx, "usage: script "); - script_file = fopen(args[0], "r"); + script_file = open_file_from_path(cmd_ctx, args[0], "r"); + if (!script_file) { command_print(cmd_ctx, "couldn't open script file %s", args[0]); @@ -231,7 +233,7 @@ int handle_script_command(struct command_context_s *cmd_ctx, char *cmd, char **a echo = cmd_ctx->echo; cmd_ctx->echo = 1; - command_run_file(cmd_ctx, script_file, COMMAND_EXEC); + command_run_file(cmd_ctx, script_file, cmd_ctx->mode); cmd_ctx->echo = echo;