prettier async output

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

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 5cfb0ab49a6abc7a0c3f5ce489d62d01db9b1646..96bbe1d2632d47734fed0e27664c038b30193595 100644 (file)
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -54,7 +54,7 @@ static char *negotiate =
  * we write to it, we will fail. Subsequent write operations will
  * succeed. Shudder!
  */
-int telnet_write(connection_t *connection, void *data, int len)
+int telnet_write(connection_t *connection, const void *data, int len)
 {
        telnet_connection_t *t_con = connection->priv;
        if (t_con->closed)
@@ -75,10 +75,32 @@ int telnet_prompt(connection_t *connection)
        return telnet_write(connection, t_con->prompt, strlen(t_con->prompt));
 }
 
-int telnet_outputline(connection_t *connection, char* line)
+int telnet_outputline(connection_t *connection, const char *line)
 {
-       telnet_write(connection, line, strlen(line));
-       return telnet_write(connection, "\r\n\0", 3);
+       int len;
+       
+       /* process lines in buffer */
+       while (*line) {
+               char *line_end = strchr(line, '\n');
+               
+               if (line_end)
+                       len = line_end-line;
+               else
+                       len = strlen(line);
+
+               telnet_write(connection, line, len);
+               if (line_end)
+               {
+                       telnet_write(connection, "\r\n\0", 3);
+                       line += len+1;
+               }
+               else
+               {
+                       line += len;
+               }
+       }
+       
+       return ERROR_OK;
 }
 
 int telnet_output(struct command_context_s *cmd_ctx, char* line)
@@ -89,44 +111,23 @@ int telnet_output(struct command_context_s *cmd_ctx, char* line)
 }
 
 void telnet_log_callback(void *priv, const char *file, int line, 
-               const char *function, const char *format, va_list args)
+               const char *function, const char *string)
 {
        connection_t *connection = priv;
-       char *t = alloc_printf(format, args);
-       char *t2;
-       if (t == NULL)
-               return;
-       t2=t;
-       char *endline;
-       do 
-       {
-               if ((endline=strchr(t2, '\n'))!=NULL)
-               {
-                       *endline=0;
-               }
-               telnet_outputline(connection, t2);
-               t2=endline+1;
-       } while (endline);
        
-       free(t);
+       telnet_write(connection, "\b\b  \b\b", strlen("\b\b  \b\b"));
+
+       telnet_outputline(connection, string);
+       
+       telnet_prompt(connection);
 }
 
 int telnet_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
 {
-       struct command_context_s *cmd_ctx = priv;
-       connection_t *connection = cmd_ctx->output_handler_priv;
-       telnet_connection_t *t_con = connection->priv;
-       
        switch (event)
        {
                case TARGET_EVENT_HALTED:
                        target_arch_state(target);
-                       if (!t_con->suppress_prompt)
-                               telnet_prompt(connection);
-                       break;
-               case TARGET_EVENT_RESUMED:
-                       if (!t_con->suppress_prompt)
-                               telnet_prompt(connection);
                        break;
                default:
                        break;
@@ -149,7 +150,6 @@ int telnet_new_connection(connection_t *connection)
        telnet_connection->line_cursor = 0;
        telnet_connection->option_size = 0;
        telnet_connection->prompt = strdup("> ");
-       telnet_connection->suppress_prompt = 0;
        telnet_connection->state = TELNET_STATE_DATA;
        
        /* output goes through telnet connection */
@@ -177,6 +177,10 @@ int telnet_new_connection(connection_t *connection)
 
        target_register_event_callback(telnet_target_callback_event_handler, connection->cmd_ctx);
        
+       log_add_callback(telnet_log_callback, connection);
+
+
+       
        return ERROR_OK;
 }
 
@@ -187,7 +191,7 @@ void telnet_clear_line(connection_t *connection, telnet_connection_t *t_con)
        {
                telnet_write(connection, 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)
        {
@@ -291,14 +295,8 @@ int telnet_input(connection_t *connection)
                                                                continue;
                                                        }
                                                        
-                                                       log_add_callback(telnet_log_callback, connection);
-                                                       t_con->suppress_prompt = 1;
-
                                                        retval = command_run_line(command_context, t_con->line);
                                                        
-                                                       log_remove_callback(telnet_log_callback, connection);
-                                                       t_con->suppress_prompt = 0;
-
                                                        if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
                                                        {
                                                                return ERROR_SERVER_REMOTE_CLOSED;
@@ -542,6 +540,8 @@ int telnet_connection_closed(connection_t *connection)
        telnet_connection_t *t_con = connection->priv;
        int i;
        
+       log_remove_callback(telnet_log_callback, connection);
+       
        if (t_con->prompt)
        {
                free(t_con->prompt);
@@ -618,9 +618,7 @@ int handle_telnet_port_command(struct command_context_s *cmd_ctx, char *cmd, cha
        if (argc == 0)
                return ERROR_OK;
 
-       /* only if the port wasn't overwritten by cmdline */
-       if (telnet_port == 0)
-               telnet_port = strtoul(args[0], NULL, 0);
+       telnet_port = strtoul(args[0], NULL, 0);
 
        return ERROR_OK;
 }