.cfg files are now executed as Jim Tcl. Commands that terminate script w/error message.

[openocd] / src / server / telnet_server.c

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 73579e4ba0be40430c485e21592576e790870a02..cc79ea411e02105d0dabbf1e80aba6dff5412e1b 100644 (file)
--- 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);
@@ -234,7 +234,7 @@ int telnet_input(connection_t *connection)
                return ERROR_SERVER_REMOTE_CLOSED;
        else if (bytes_read == -1)
        {
-               ERROR("error during read: %s", strerror(errno));
+               LOG_ERROR("error during read: %s", strerror(errno));
                return ERROR_SERVER_REMOTE_CLOSED;
        }
 
@@ -413,7 +413,7 @@ int telnet_input(connection_t *connection)
                                                }
                                                else
                                                {
-                                                       DEBUG("unhandled nonprintable: %2.2x", *buf_p);
+                                                       LOG_DEBUG("unhandled nonprintable: %2.2x", *buf_p);
                                                }
                                        }
                                }
@@ -546,13 +546,13 @@ int telnet_input(connection_t *connection)
                                }
                                else
                                {
-                                       ERROR("BUG: unexpected value in t_con->last_escape");
+                                       LOG_ERROR("BUG: unexpected value in t_con->last_escape");
                                        t_con->state = TELNET_STATE_DATA;
                                }
 
                                break;
                        default:
-                               ERROR("unknown telnet state");
+                               LOG_ERROR("unknown telnet state");
                                exit(-1);
                }
 
@@ -595,7 +595,7 @@ int telnet_connection_closed(connection_t *connection)
        }
        else
        {
-               ERROR("BUG: connection->priv == NULL");
+               LOG_ERROR("BUG: connection->priv == NULL");
        }
 
        target_unregister_event_callback(telnet_target_callback_event_handler, connection->cmd_ctx);
@@ -621,7 +621,7 @@ int telnet_init(char *banner)
 
        if (telnet_port == 0)
        {
-               WARNING("no telnet port specified, using default port 4444");
+               LOG_WARNING("no telnet port specified, using default port 4444");
                telnet_port = 4444;
        }