* 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)
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)
}
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_outputline(connection, string);
}
int telnet_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
{
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)
{
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;
}