diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/gdb_server.c | 20 | ||||
| -rw-r--r-- | src/server/telnet_server.c | 14 |
2 files changed, 14 insertions, 20 deletions
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index c2c18baf..3ea1dde0 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -568,7 +568,7 @@ int gdb_output_con(connection_t *connection, const char* line) return ERROR_OK; } -int gdb_output(struct command_context_s *context, char* line) +int gdb_output(struct command_context_s *context, const char* line) { /* this will be dumped to the log and also sent as an O packet if possible */ LOG_USER_N("%s", line); @@ -577,24 +577,10 @@ int gdb_output(struct command_context_s *context, char* line) int gdb_program_handler(struct target_s *target, enum target_event event, void *priv) { - FILE *script; struct command_context_s *cmd_ctx = priv; - if (target->gdb_program_script) - { - script = open_file_from_path(target->gdb_program_script, "r"); - if (!script) - { - LOG_ERROR("couldn't open script file %s", target->gdb_program_script); - return ERROR_OK; - } - - LOG_INFO("executing gdb_program script '%s'", target->gdb_program_script); - command_run_file(cmd_ctx, script, COMMAND_EXEC); - fclose(script); - - jtag_execute_queue(); - } + target_invoke_script(cmd_ctx, target, "gdb_program"); + jtag_execute_queue(); return ERROR_OK; } diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c index fc3f2116..fc39c729 100644 --- a/src/server/telnet_server.c +++ b/src/server/telnet_server.c @@ -92,7 +92,7 @@ int telnet_outputline(connection_t *connection, const char *line) telnet_write(connection, line, len); if (line_end) { - telnet_write(connection, "\r\n\0", 3); + telnet_write(connection, "\r\n", 2); line += len+1; } else @@ -104,7 +104,7 @@ int telnet_outputline(connection_t *connection, const char *line) return ERROR_OK; } -int telnet_output(struct command_context_s *cmd_ctx, char* line) +int telnet_output(struct command_context_s *cmd_ctx, const char* line) { connection_t *connection = cmd_ctx->output_handler_priv; @@ -181,7 +181,7 @@ int telnet_new_connection(connection_t *connection) if (telnet_service->banner) { telnet_write(connection, telnet_service->banner, strlen(telnet_service->banner)); - telnet_write(connection, "\r\n\0", 3); + telnet_write(connection, "\r\n", 2); } telnet_prompt(connection); @@ -658,3 +658,11 @@ int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **arg { return ERROR_COMMAND_CLOSE_CONNECTION; } + +/* + * Local Variables: ** + * tab-width: 4 ** + * c-basic-offset: 4 ** + * End: ** + */ + |