- combine similar functions in telnet_server.c

[openocd.git] / src / server / telnet_server.c

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 5353369a1669c60fa9d5350bf5ac76145a6ed98e..a268d81249961c59c5af3b5c1ee895b0ccd19668 100644 (file)
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -67,6 +67,18 @@ int telnet_output(struct command_context_s *cmd_ctx, char* line)
        return ERROR_OK;
 }
 
+void telnet_log_callback(void *priv, const char *file, int line, 
+               const char *function, const char *format, va_list args)
+{
+       connection_t *connection = priv;
+       char *t = allocPrintf(format, args);
+       if (t == NULL)
+               return;
+       
+       telnet_output(connection->cmd_ctx, t);
+       free(t);
+}
+
 int telnet_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
 {
        struct command_context_s *cmd_ctx = priv;
@@ -81,13 +93,13 @@ int telnet_target_callback_event_handler(struct target_s *target, enum target_ev
                        target->type->arch_state(target, buffer, 512);
                        buffer[511] = 0;
                        command_print(cmd_ctx, "%s", buffer);
-                       telnet_prompt(connection);
-                       t_con->suppress_prompt = 1;
+                       if (!t_con->suppress_prompt)
+                               telnet_prompt(connection);
                        break;
                case TARGET_EVENT_RESUMED:
                        command_print(cmd_ctx, "Target %i resumed", get_num_by_target(target));
-                       telnet_prompt(connection);
-                       t_con->suppress_prompt = 1;
+                       if (!t_con->suppress_prompt)
+                               telnet_prompt(connection);
                        break;
                default:
                        break;
@@ -251,9 +263,9 @@ int telnet_input(connection_t *connection)
                                                                continue;
                                                        }
                                                        
-                                                       /* we're running a command, so we need a prompt
-                                                        * if the output handler is called, this gets set again */
-                                                       t_con->suppress_prompt = 0;
+                                                       log_setCallback(telnet_log_callback, connection);
+                                                       t_con->suppress_prompt = 1;
+                                                       
                                                        if ((retval = command_run_line(command_context, t_con->line)) != ERROR_OK)
                                                        {
                                                                if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
@@ -261,7 +273,9 @@ int telnet_input(connection_t *connection)
                                                                        return ERROR_SERVER_REMOTE_CLOSED;
                                                                }
                                                        }
-
+                                                       
+                                                       t_con->suppress_prompt = 0;
+                                                       
                                                        /* Save only non-blank lines in the history */
                                                        if (t_con->line_size > 0)
                                                        {
@@ -287,14 +301,8 @@ int telnet_input(connection_t *connection)
                                                                t_con->history[t_con->current_history] = strdup("");
                                                        }
                                                        
-                                                       if (!t_con->suppress_prompt)
-                                                       {
-                                                               telnet_prompt(connection);
-                                                       }
-                                                       else
-                                                       {
-                                                               t_con->suppress_prompt = 0;
-                                                       }
+                                                       /* output prompt after command */
+                                                       telnet_prompt(connection);
                                                        
                                                        t_con->line_size = 0;
                                                        t_con->line_cursor = 0;