This is an automated email from Gerrit.
Tarek BOCHKATI (tarek.bouchk...@gmail.com) just uploaded a new patch set to
Gerrit, which you can find at http://openocd.zylin.com/6440
-- gerrit
commit 1bfb402a5f66fff99cda256f0e2a18324363913e
Author: Tarek BOCHKATI <tarek.bouchk...@gmail.com>
Date: Wed Aug 18 18:41:49 2021 +0100
server/telnet: simplify telnet_input function [WIP/RFC]
running complexity on this file tells that:
NOTE: proc telnet_input in file telnet_server.c line 576
nesting depth reached level 8
==> *seriously consider rewriting the procedure*.
so try to reduce the nesting depth of telnet_input function
Change-Id: I64ecb0c54da83c27a343f2a1df99fc8f9484572a
Signed-off-by: Tarek BOCHKATI <tarek.bouchk...@gmail.com>
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index f7b3f64..424efbd 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -320,6 +320,32 @@ static void telnet_history_down(struct connection
*connection)
telnet_history_go(connection, next_history);
}
+static void telnet_history_add(struct connection *connection)
+{
+ struct telnet_connection *t_con = connection->priv;
+
+ /* save only non-blank not repeating lines in the history */
+ char *prev_line = t_con->history[(t_con->current_history > 0) ?
+ t_con->current_history - 1 :
TELNET_LINE_HISTORY_SIZE-1];
+
+ if (*t_con->line && (!prev_line || strcmp(t_con->line, prev_line))) {
+ /* if the history slot is already taken, free it */
+ 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;
+
+ free(t_con->history[t_con->current_history]);
+ t_con->history[t_con->current_history] = strdup("");
+ }
+}
+
static int telnet_history_print(struct connection *connection)
{
struct telnet_connection *tc;
@@ -419,6 +445,85 @@ static bool telnet_insert(struct connection *connection,
const void *data, size_
return true;
}
+static void telnet_delete_character(struct connection *connection)
+{
+ struct telnet_connection *t_con = connection->priv;
+
+ if (t_con->line_cursor == 0)
+ return;
+
+ if (t_con->line_cursor != t_con->line_size) {
+ size_t i;
+ telnet_write(connection, "\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);
+
+ telnet_write(connection,
+ t_con->line + t_con->line_cursor,
+ t_con->line_size -
+ t_con->line_cursor);
+ telnet_write(connection, " \b", 2);
+ for (i = t_con->line_cursor; i < t_con->line_size; i++)
+ telnet_write(connection, "\b", 1);
+ } else {
+ t_con->line_size--;
+ t_con->line_cursor--;
+ /* back space: move the 'printer' head one char
+ * back, overwrite with space, move back again */
+ telnet_write(connection, "\b \b", 3);
+ }
+
+}
+
+static int telnet_exec_line(struct connection *connection)
+{
+ struct telnet_connection *t_con = connection->priv;
+ struct command_context *command_context = connection->cmd_ctx;
+ int retval;
+
+ telnet_write(connection, "\r\n\x00", 3);
+
+ if (strcmp(t_con->line, "history") == 0) {
+ retval = telnet_history_print(connection);
+
+ if (retval != ERROR_OK)
+ return retval;
+
+ return ERROR_OK;
+ }
+
+ telnet_history_add(connection);
+
+ t_con->line_size = 0;
+
+ /* to suppress prompt in log callback during command execution */
+ t_con->prompt_visible = false;
+
+ if (strcmp(t_con->line, "shutdown") == 0)
+ telnet_save_history(t_con);
+
+ retval = command_run_line(command_context, t_con->line);
+
+ t_con->line_cursor = 0;
+ t_con->prompt_visible = true;
+
+ if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
+ return ERROR_SERVER_REMOTE_CLOSED;
+
+ /* the prompt is always placed at the line beginning */
+ telnet_write(connection, "\r", 1);
+
+ retval = telnet_prompt(connection);
+ if (retval == ERROR_SERVER_REMOTE_CLOSED)
+ return ERROR_SERVER_REMOTE_CLOSED;
+
+ return ERROR_OK;
+}
+
static void telnet_auto_complete(struct connection *connection)
{
struct telnet_connection *t_con = connection->priv;
@@ -587,7 +692,6 @@ static int telnet_input(struct connection *connection)
unsigned char buffer[TELNET_BUFFER_SIZE];
unsigned char *buf_p;
struct telnet_connection *t_con = connection->priv;
- struct command_context *command_context = connection->cmd_ctx;
bytes_read = connection_read(connection, buffer, TELNET_BUFFER_SIZE);
@@ -626,90 +730,11 @@ static int telnet_input(struct connection *connection)
}
t_con->line[t_con->line_size] = 0;
-
telnet_write(connection, "\r\n\x00", 3);
-
- if (strcmp(t_con->line,
"history") == 0) {
- retval =
telnet_history_print(connection);
-
- if (retval !=
ERROR_OK)
- return
retval;
-
- continue;
- }
-
- /* save only non-blank
not repeating lines in the history */
- char *prev_line =
t_con->history[(t_con->current_history > 0) ?
-
t_con->current_history - 1 : TELNET_LINE_HISTORY_SIZE-1];
- if (*t_con->line &&
(!prev_line ||
-
strcmp(t_con->line, prev_line))) {
- /* if the
history slot is already taken, free it */
-
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;
-
-
free(t_con->history[t_con->current_history]);
-
t_con->history[t_con->current_history] = strdup("");
- }
-
- t_con->line_size = 0;
-
- /* to suppress prompt
in log callback during command execution */
- t_con->prompt_visible =
false;
-
- if (strcmp(t_con->line,
"shutdown") == 0)
-
telnet_save_history(t_con);
-
- retval =
command_run_line(command_context, t_con->line);
-
- t_con->line_cursor = 0;
- t_con->prompt_visible =
true;
-
- if (retval ==
ERROR_COMMAND_CLOSE_CONNECTION)
- return
ERROR_SERVER_REMOTE_CLOSED;
-
- /* the prompt is always
* placed at the line beginning */
-
telnet_write(connection, "\r", 1);
-
- retval =
telnet_prompt(connection);
- if (retval ==
ERROR_SERVER_REMOTE_CLOSED)
- return
ERROR_SERVER_REMOTE_CLOSED;
-
+ retval =
telnet_exec_line(connection);
+ if (retval != ERROR_OK)
+ return retval;
} else if ((*buf_p == 0x7f) ||
(*buf_p == 0x8)) { /* delete character */
- if (t_con->line_cursor
> 0) {
- if
(t_con->line_cursor != t_con->line_size) {
- size_t
i;
-
telnet_write(connection, "\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);
-
-
telnet_write(connection,
-
t_con->line + t_con->line_cursor,
-
t_con->line_size -
-
t_con->line_cursor);
-
telnet_write(connection, " \b", 2);
- for (i
= t_con->line_cursor; i < t_con->line_size; i++)
-
telnet_write(connection, "\b", 1);
- } else {
-
t_con->line_size--;
-
t_con->line_cursor--;
- /* back
space: move the 'printer' head one char
- *
back, overwrite with space, move back again */
-
telnet_write(connection, "\b \b", 3);
- }
- }
+
telnet_delete_character(connection);
} else if (*buf_p == 0x15) {
/* clear line */
telnet_clear_line(connection, t_con);
} else if (*buf_p == CTRL('B'))
{ /* cursor left */
--
