[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-rc1-166-gf68dff6

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  f68dff66904321392c3137db7eb40e8633c2e507 (commit)
      from  e11ce3e6b00f02eba9a15673a54f5345eba8398b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f68dff66904321392c3137db7eb40e8633c2e507
Author: Øyvind Harboe <oyv...@zy...>
Date:   Thu Jan 21 16:41:54 2010 +0100

    telnet: fix strage blank spaces at beginning of telnet lines
    
    Sometimes we saw two strange blank spaces at the beginning
    of the telnet lines.
    
    progress
      ogress
    >
    
    This patch fixes this problem:
    
    progress
    progress
    >
    
    The code changes are *reasonably* clean, but perhaps it could be
    made a bit more elegant, but I didn't want to change things after
    I finished diagnosis/testing & submitting the patch.
    
    The problem was that logging can send the text and the newline
    separately in two different requests and the telnet code would
    incorrectly remove the prompt from the end of a line.
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 6f26f0a..94c8943 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -62,7 +62,6 @@ int telnet_prompt(struct connection *connection)
 {
 	struct telnet_connection *t_con = connection->priv;
 
-	telnet_write(connection, "\r", 1); /* the prompt is always placed at the line beginning */
 	return telnet_write(connection, t_con->prompt, strlen(t_con->prompt));
 }
 
@@ -116,10 +115,12 @@ void telnet_log_callback(void *priv, const char *file, unsigned line,
 	}
 
 	/* clear the command line */
-	telnet_write(connection, "\r", 1);
+	for (i = strlen(t_con->prompt) + t_con->line_size; i > 0; i -= 16)
+		telnet_write(connection, "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b", i > 16 ? 16 : i);
 	for (i = strlen(t_con->prompt) + t_con->line_size; i > 0; i -= 16)
 		telnet_write(connection, "                ", i > 16 ? 16 : i);
-	telnet_write(connection, "\r", 1);
+	for (i = strlen(t_con->prompt) + t_con->line_size; i > 0; i -= 16)
+		telnet_write(connection, "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b", i > 16 ? 16 : i);
 
 	/* output the message */
 	telnet_outputline(connection, string);
@@ -160,6 +161,7 @@ int telnet_new_connection(struct connection *connection)
 		telnet_write(connection, "\r\n", 2);
 	}
 
+	telnet_write(connection, "\r", 1); /* the prompt is always placed at the line beginning */
 	telnet_prompt(connection);
 
 	/* initialize history */
@@ -331,6 +333,7 @@ int telnet_input(struct connection *connection)
 							if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
 								return ERROR_SERVER_REMOTE_CLOSED;
 
+							telnet_write(connection, "\r", 1); /* the prompt is always placed at the line beginning */
 							retval = telnet_prompt(connection);
 							if (retval == ERROR_SERVER_REMOTE_CLOSED)
 								return ERROR_SERVER_REMOTE_CLOSED;

-----------------------------------------------------------------------

Summary of changes:
 src/server/telnet_server.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository