X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Ftelnet_server.c;h=b573ec5c8332db286caa70bc0463ed297ce82c15;hp=d7933293ae2213a7501c46a7ba23c499fbf5a012;hb=82d2633b5f550115e9e7c7d0520babb6680aa38f;hpb=8b4e882a1630d63bbc9840fa3f968e36b6ac3702 diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c index d7933293ae..b573ec5c83 100644 --- a/src/server/telnet_server.c +++ b/src/server/telnet_server.c @@ -17,6 +17,12 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "replacements.h" + #include "telnet_server.h" #include "server.h" @@ -47,15 +53,15 @@ void telnet_prompt(connection_t *connection) { telnet_connection_t *t_con = connection->priv; - write(connection->fd, t_con->prompt, strlen(t_con->prompt)); + write_socket(connection->fd, t_con->prompt, strlen(t_con->prompt)); } int telnet_output(struct command_context_s *cmd_ctx, char* line) { connection_t *connection = cmd_ctx->output_handler_priv; - write(connection->fd, line, strlen(line)); - write(connection->fd, "\r\n\0", 3); + write_socket(connection->fd, line, strlen(line)); + write_socket(connection->fd, "\r\n\0", 3); return ERROR_OK; } @@ -75,12 +81,12 @@ int telnet_target_callback_event_handler(struct target_s *target, enum target_ev buffer[511] = 0; command_print(cmd_ctx, "%s", buffer); telnet_prompt(connection); - t_con->surpress_prompt = 1; + t_con->suppress_prompt = 1; break; case TARGET_EVENT_RESUMED: command_print(cmd_ctx, "Target %i resumed", get_num_by_target(target)); telnet_prompt(connection); - t_con->surpress_prompt = 1; + t_con->suppress_prompt = 1; break; default: break; @@ -102,20 +108,20 @@ int telnet_new_connection(connection_t *connection) telnet_connection->line_cursor = 0; telnet_connection->option_size = 0; telnet_connection->prompt = strdup("> "); - telnet_connection->surpress_prompt = 0; + telnet_connection->suppress_prompt = 0; telnet_connection->state = TELNET_STATE_DATA; /* output goes through telnet connection */ command_set_output_handler(connection->cmd_ctx, telnet_output, connection); /* negotiate telnet options */ - write(connection->fd, negotiate, strlen(negotiate)); + write_socket(connection->fd, negotiate, strlen(negotiate)); /* print connection banner */ if (telnet_service->banner) { - write(connection->fd, telnet_service->banner, strlen(telnet_service->banner)); - write(connection->fd, "\r\n\0", 3); + write_socket(connection->fd, telnet_service->banner, strlen(telnet_service->banner)); + write_socket(connection->fd, "\r\n\0", 3); } telnet_prompt(connection); @@ -138,13 +144,13 @@ void telnet_clear_line(connection_t *connection, telnet_connection_t *t_con) /* move to end of line */ if (t_con->line_cursor < t_con->line_size) { - write(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); + write_socket(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); } /* backspace, overwrite with space, backspace */ while (t_con->line_size > 0) { - write(connection->fd, "\b \b", 3); + write_socket(connection->fd, "\b \b", 3); t_con->line_size--; } t_con->line_cursor = 0; @@ -158,7 +164,7 @@ int telnet_input(connection_t *connection) telnet_connection_t *t_con = connection->priv; command_context_t *command_context = connection->cmd_ctx; - bytes_read = read(connection->fd, buffer, TELNET_BUFFER_SIZE); + bytes_read = read_socket(connection->fd, buffer, TELNET_BUFFER_SIZE); if (bytes_read == 0) return ERROR_SERVER_REMOTE_CLOSED; @@ -182,7 +188,7 @@ int telnet_input(connection_t *connection) { if (isprint(*buf_p)) /* printable character */ { - write(connection->fd, buf_p, 1); + write_socket(connection->fd, buf_p, 1); if (t_con->line_cursor == t_con->line_size) { t_con->line[t_con->line_size++] = *buf_p; @@ -194,10 +200,10 @@ int telnet_input(connection_t *connection) memmove(t_con->line + t_con->line_cursor + 1, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); t_con->line[t_con->line_cursor++] = *buf_p; t_con->line_size++; - write(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); + write_socket(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); for (i = t_con->line_cursor; i < t_con->line_size; i++) { - write(connection->fd, "\b", 1); + write_socket(connection->fd, "\b", 1); } } } @@ -225,7 +231,7 @@ int telnet_input(connection_t *connection) } t_con->line[t_con->line_size] = 0; - write(connection->fd, "\r\n\x00", 3); + write_socket(connection->fd, "\r\n\x00", 3); if (strcmp(t_con->line, "history") == 0) { @@ -234,8 +240,8 @@ int telnet_input(connection_t *connection) { if (t_con->history[i]) { - write(connection->fd, t_con->history[i], strlen(t_con->history[i])); - write(connection->fd, "\r\n\x00", 3); + write_socket(connection->fd, t_con->history[i], strlen(t_con->history[i])); + write_socket(connection->fd, "\r\n\x00", 3); } } telnet_prompt(connection); @@ -246,7 +252,7 @@ int telnet_input(connection_t *connection) /* we're running a command, so we need a prompt * if the output handler is called, this gets set again */ - t_con->surpress_prompt = 0; + t_con->suppress_prompt = 0; if ((retval = command_run_line(command_context, t_con->line)) != ERROR_OK) { if (retval == ERROR_COMMAND_CLOSE_CONNECTION) @@ -254,36 +260,39 @@ int telnet_input(connection_t *connection) return ERROR_SERVER_REMOTE_CLOSED; } } - - /* if the history slot is already taken, free it */ - if (t_con->history[t_con->next_history]) + + /* Save only non-blank lines in the history */ + if (t_con->line_size > 0) { - free(t_con->history[t_con->next_history]); - } - - /* add line to history */ - t_con->history[t_con->next_history++] = strdup(t_con->line); + /* if the history slot is already taken, free it */ + if (t_con->history[t_con->next_history]) + { + free(t_con->history[t_con->next_history]); + } + + /* add line to history */ + t_con->history[t_con->next_history] = strdup(t_con->line); + + /* wrap history at TELNET_LINE_HISTORY_SIZE */ + t_con->next_history = (t_con->next_history + 1) % TELNET_LINE_HISTORY_SIZE; - /* current history line starts at the new entry */ - t_con->current_history = t_con->next_history; + /* current history line starts at the new entry */ + t_con->current_history = t_con->next_history; - if (t_con->history[t_con->current_history]) - { - free(t_con->history[t_con->current_history]); + if (t_con->history[t_con->current_history]) + { + free(t_con->history[t_con->current_history]); + } + t_con->history[t_con->current_history] = strdup(""); } - t_con->history[t_con->current_history] = strdup(""); - - /* wrap history at TELNET_LINE_HISTORY_SIZE */ - if (t_con->next_history > TELNET_LINE_HISTORY_SIZE - 1) - t_con->next_history = 0; - if (!t_con->surpress_prompt) + if (!t_con->suppress_prompt) { telnet_prompt(connection); } else { - t_con->surpress_prompt = 0; + t_con->suppress_prompt = 0; } t_con->line_size = 0; @@ -296,16 +305,16 @@ int telnet_input(connection_t *connection) if (t_con->line_cursor != t_con->line_size) { int i; - write(connection->fd, "\b", 1); + write_socket(connection->fd, "\b", 1); t_con->line_cursor--; t_con->line_size--; memmove(t_con->line + t_con->line_cursor, t_con->line + t_con->line_cursor + 1, t_con->line_size - t_con->line_cursor); - write(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); - write(connection->fd, " \b", 2); + write_socket(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); + write_socket(connection->fd, " \b", 2); for (i = t_con->line_cursor; i < t_con->line_size; i++) { - write(connection->fd, "\b", 1); + write_socket(connection->fd, "\b", 1); } } else @@ -313,7 +322,7 @@ int telnet_input(connection_t *connection) t_con->line_size--; t_con->line_cursor--; /* back space: move the 'printer' head one char back, overwrite with space, move back again */ - write(connection->fd, "\b \b", 3); + write_socket(connection->fd, "\b \b", 3); } } } @@ -325,7 +334,7 @@ int telnet_input(connection_t *connection) { if (t_con->line_cursor > 0) { - write(connection->fd, "\b", 1); + write_socket(connection->fd, "\b", 1); t_con->line_cursor--; } t_con->state = TELNET_STATE_DATA; @@ -334,7 +343,7 @@ int telnet_input(connection_t *connection) { if (t_con->line_cursor < t_con->line_size) { - write(connection->fd, t_con->line + t_con->line_cursor++, 1); + write_socket(connection->fd, t_con->line + t_con->line_cursor++, 1); } t_con->state = TELNET_STATE_DATA; } @@ -379,7 +388,7 @@ int telnet_input(connection_t *connection) { if (t_con->line_cursor > 0) { - write(connection->fd, "\b", 1); + write_socket(connection->fd, "\b", 1); t_con->line_cursor--; } t_con->state = TELNET_STATE_DATA; @@ -388,34 +397,34 @@ int telnet_input(connection_t *connection) { if (t_con->line_cursor < t_con->line_size) { - write(connection->fd, t_con->line + t_con->line_cursor++, 1); + write_socket(connection->fd, t_con->line + t_con->line_cursor++, 1); } t_con->state = TELNET_STATE_DATA; } else if (*buf_p == 'A') /* cursor up */ { - int last_history = (t_con->current_history - 1 >= 0) ? t_con->current_history - 1 : 127; + int last_history = (t_con->current_history > 0) ? t_con->current_history - 1 : TELNET_LINE_HISTORY_SIZE-1; if (t_con->history[last_history]) { telnet_clear_line(connection, t_con); t_con->line_size = strlen(t_con->history[last_history]); t_con->line_cursor = t_con->line_size; memcpy(t_con->line, t_con->history[last_history], t_con->line_size + 1); - write(connection->fd, t_con->line, t_con->line_size); + write_socket(connection->fd, t_con->line, t_con->line_size); t_con->current_history = last_history; } t_con->state = TELNET_STATE_DATA; } else if (*buf_p == 'B') /* cursor down */ { - int next_history = (t_con->current_history + 1 < 128) ? t_con->current_history + 1 : 0; + int next_history = (t_con->current_history + 1) % TELNET_LINE_HISTORY_SIZE; if (t_con->history[next_history]) { telnet_clear_line(connection, t_con); t_con->line_size = strlen(t_con->history[next_history]); t_con->line_cursor = t_con->line_size; memcpy(t_con->line, t_con->history[next_history], t_con->line_size + 1); - write(connection->fd, t_con->line, t_con->line_size); + write_socket(connection->fd, t_con->line, t_con->line_size); t_con->current_history = next_history; } t_con->state = TELNET_STATE_DATA; @@ -442,14 +451,14 @@ int telnet_input(connection_t *connection) memmove(t_con->line + t_con->line_cursor, t_con->line + t_con->line_cursor + 1, t_con->line_size - t_con->line_cursor); /* print remainder of buffer */ - write(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); + write_socket(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); /* overwrite last char with whitespace */ - write(connection->fd, " \b", 2); + write_socket(connection->fd, " \b", 2); /* move back to cursor position*/ for (i = t_con->line_cursor; i < t_con->line_size; i++) { - write(connection->fd, "\b", 1); + write_socket(connection->fd, "\b", 1); } }