X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2Ftcl_server.c;h=b62f1a37e2c99e584e61020f9a13dd0d53fc9206;hb=750f8cd0c56baed8b27be415bcff9effa59c48e3;hp=f82cafefd5492fd1a7943d2fd7127122a2c8a31a;hpb=6c137a2fc0bf53b9c0b8eda51e6f5361552b0112;p=openocd.git

diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c
index f82cafefd5..b62f1a37e2 100644
--- a/src/server/tcl_server.c
+++ b/src/server/tcl_server.c
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -24,18 +24,17 @@
 
 #include "tcl_server.h"
 
-
-#define TCL_SERVER_VERSION	"TCL Server 0.1"
-#define TCL_MAX_LINE		(4096)
+#define TCL_SERVER_VERSION		"TCL Server 0.1"
+#define TCL_MAX_LINE			(4096)
 
 struct tcl_connection {
 	int tc_linedrop;
 	int tc_lineoffset;
 	char tc_line[TCL_MAX_LINE];
-	int tc_outerror; /* flag an output error */
+	int tc_outerror;/* flag an output error */
 };
 
-static const char *tcl_port;
+static char *tcl_port;
 
 /* handlers */
 static int tcl_new_connection(struct connection *connection);
@@ -104,8 +103,7 @@ static int tcl_input(struct connection *connection)
 		return ERROR_CONNECTION_REJECTED;
 
 	/* push as much data into the line as possible */
-	for (i = 0; i < rlen; i++)
-	{
+	for (i = 0; i < rlen; i++) {
 		/* buffer the data */
 		tclc->tc_line[tclc->tc_lineoffset] = in[i];
 		if (tclc->tc_lineoffset < TCL_MAX_LINE)
@@ -127,13 +125,12 @@ static int tcl_input(struct connection *connection)
 			if (retval != ERROR_OK)
 				return retval;
 #undef ESTR
-		}
-		else {
+		} else {
 			tclc->tc_line[tclc->tc_lineoffset-1] = '\0';
 			LOG_DEBUG("Executing script:\n %s", tclc->tc_line);
-			retval = Jim_Eval_Named(interp, tclc->tc_line, "remote:connection",1);
-			LOG_DEBUG("Result: %d\n %s", retval, Jim_GetString(Jim_GetResult(interp), &reslen));
+			retval = Jim_Eval_Named(interp, tclc->tc_line, "remote:connection", 1);
 			result = Jim_GetString(Jim_GetResult(interp), &reslen);
+			LOG_DEBUG("Result: %d\n %s", retval, result);
 			retval = tcl_output(connection, result, reslen);
 			if (retval != ERROR_OK)
 				return retval;
@@ -160,15 +157,14 @@ static int tcl_closed(struct connection *connection)
 
 int tcl_init(void)
 {
-	if (strcmp(tcl_port, "disabled") == 0)
-	{
+	if (strcmp(tcl_port, "disabled") == 0) {
 		LOG_INFO("tcl server disabled");
 		return ERROR_OK;
 	}
 
-	return add_service_pipe("tcl", tcl_port, 1,
-			&tcl_new_connection, &tcl_input,
-			&tcl_closed, NULL);
+	return add_service("tcl", tcl_port, 1,
+		&tcl_new_connection, &tcl_input,
+		&tcl_closed, NULL);
 }
 
 COMMAND_HANDLER(handle_tcl_port_command)
@@ -180,10 +176,10 @@ static const struct command_registration tcl_command_handlers[] = {
 	{
 		.name = "tcl_port",
 		.handler = handle_tcl_port_command,
-		.mode = COMMAND_CONFIG,
+		.mode = COMMAND_ANY,
 		.help = "Specify port on which to listen "
 			"for incoming Tcl syntax.  "
-			"No arguments reports Tcl port; zero disables.",
+			"Read help on 'gdb_port'.",
 		.usage = "[port_num]",
 	},
 	COMMAND_REGISTRATION_DONE