[Openocd-svn] r1246 - trunk/src/helper

[<oh...@ma...>]

Author: oharboe
Date: 2008-12-16 11:22:24 +0100 (Tue, 16 Dec 2008)
New Revision: 1246

Modified:
   trunk/src/helper/command.c
Log:
fix broken -c/f options where it would silently terminate for scripts that did not set the return value.

Modified: trunk/src/helper/command.c
===================================================================
--- trunk/src/helper/command.c	2008-12-15 16:10:18 UTC (rev 1245)
+++ trunk/src/helper/command.c	2008-12-16 10:22:24 UTC (rev 1246)
@@ -290,9 +290,9 @@
 
 	/* find command */
 	c = context->commands;
-	
+
 	while(NULL != c)
-	{		
+	{
 		if (strcmp(name, c->name) == 0)
 		{
 			/* unlink command */
@@ -305,7 +305,7 @@
 				/* first element in command list */
 				context->commands = c->next;
 			}
-			
+
 			/* unregister children */
 			while(NULL != c->children)
 			{
@@ -316,7 +316,7 @@
 				free(c2);
 				c2 = NULL;
 			}
-			
+
 			/* delete command */
 			free(c->name);
 			c->name = NULL;
@@ -324,7 +324,7 @@
 			c = NULL;
 			return ERROR_OK;
 		}
-		
+
 		/* remember the last command for unlinking */
 		p = c;
 		c = c->next;
@@ -479,21 +479,20 @@
 		int reslen;
 
 		result = Jim_GetString(Jim_GetResult(interp), &reslen);
-		if (reslen) {
-			int i;
-			char buff[256+1];
-			for (i = 0; i < reslen; i += 256)
-			{
-				int chunk;
-				chunk = reslen - i;
-				if (chunk > 256)
-					chunk = 256;
-				strncpy(buff, result+i, chunk);
-				buff[chunk] = 0;
-				LOG_USER_N("%s", buff);
-			}
-			LOG_USER_N("%s", "\n");
+		int i;
+		char buff[256+1];
+		for (i = 0; i < reslen; i += 256)
+		{
+			int chunk;
+			chunk = reslen - i;
+			if (chunk > 256)
+				chunk = 256;
+			strncpy(buff, result+i, chunk);
+			buff[chunk] = 0;
+			LOG_USER_N("%s", buff);
 		}
+		LOG_USER_N("%s", "\n");
+		retval=ERROR_OK;
 	}
 	return retval;
 }