From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Tue, 18 May 2010 10:34:12 +0000 (+0200)
Subject: jim: fix bug in tcl "puts"
X-Git-Tag: v0.5.0-rc1~678
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c86d7bdad4418f4fc3d81a68398187c6480316fa;p=openocd

jim: fix bug in tcl "puts"

tcl "puts" didn't work because the logging code sensored strings
that did not include a '\n'. The correct thing is to sensor
empty strings, which are used to keep gdb connection alive.

The tcl "puts" code broke apart strings which do contain '\n' in
order to implement the -nonewline argument, which is how it
got hurt by the bug in log.c

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/helper/log.c b/src/helper/log.c
index 7ace9302..da227bd7 100644
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -139,7 +139,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
 	if (f != NULL)
 		file = f + 1;
 
-	if (strchr(string, '\n') != NULL)
+	if (strlen(string) > 0)
 	{
 		if (debug_level >= LOG_LVL_DEBUG)
 		{
@@ -163,17 +163,12 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
 		{
 			/* if we are using gdb through pipes then we do not want any output
 			 * to the pipe otherwise we get repeated strings */
-			if (strcmp(string, "\n") != 0)
-			{
-				/* print human readable output - but skip empty lines */
-				fprintf(log_output, "%s%s",
-						(level > LOG_LVL_USER)?log_strings[level + 1]:"", string);
-			}
+			fprintf(log_output, "%s%s",
+					(level > LOG_LVL_USER)?log_strings[level + 1]:"", string);
 		}
 	} else
 	{
-		/* only entire lines are logged. Otherwise it's
-		 * single chars intended for the log callbacks. */
+		/* Empty strings are sent to log callbacks to keep e.g. gdbserver alive, here we do nothing. */
 	}
 
 	fflush(log_output);