summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-09-08 20:04:27 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-09-20 20:45:48 +0200
commit6000411dddd9930b99a4931bc363f425cc0fdcda (patch)
tree42737f790fb6b0690c97a3b752a56a453f1552b8 /src/server
parent241fd0b5a8a95e814395f79b5ea7715c1862f045 (diff)
downloadopenocd_libswd-6000411dddd9930b99a4931bc363f425cc0fdcda.tar.gz
openocd_libswd-6000411dddd9930b99a4931bc363f425cc0fdcda.tar.bz2
openocd_libswd-6000411dddd9930b99a4931bc363f425cc0fdcda.tar.xz
openocd_libswd-6000411dddd9930b99a4931bc363f425cc0fdcda.zip
tcl_server: switch to ctrl-z
by using ctrl-z instead of line end, multi-line tcl scripts can be handled. Testing: send ctrl-z a couple of times to make telnet enter the mode where it sends ctrl-z unencoded. Programs that talk to the tcl_server can send ctrl-z to indicate end of tcl-let to be executed without having to worry about telnet protocols. Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/server')
-rw-r--r--src/server/tcl_server.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c
index 7c8e130b..06f67ab7 100644
--- a/src/server/tcl_server.c
+++ b/src/server/tcl_server.c
@@ -1,5 +1,6 @@
/***************************************************************************
- * Copyright (C) 2008 *
+ * Copyright (C) 2010 Øyvind Harboe *
+ * oyvind.harboe@zylin.com *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -104,13 +105,6 @@ static int tcl_input(struct connection *connection)
/* push as much data into the line as possible */
for (i = 0; i < rlen; i++)
{
- if (!isprint(in[i]) && !isspace(in[i]))
- {
- /* drop this line */
- tclc->tc_linedrop = 1;
- continue;
- }
-
/* buffer the data */
tclc->tc_line[tclc->tc_lineoffset] = in[i];
if (tclc->tc_lineoffset < TCL_MAX_LINE)
@@ -118,7 +112,11 @@ static int tcl_input(struct connection *connection)
else
tclc->tc_linedrop = 1;
- if (in[i] != '\n')
+ /* ctrl-z is end of command. When testing from telnet, just
+ * press ctrl-z a couple of times first to put telnet into the
+ * mode where it will send 0x1a in response to pressing ctrl-z
+ */
+ if (in[i] != '\x1a')
continue;
/* process the line */
@@ -131,13 +129,15 @@ static int tcl_input(struct connection *connection)
}
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));
result = Jim_GetString(Jim_GetResult(interp), &reslen);
retval = tcl_output(connection, result, reslen);
if (retval != ERROR_OK)
return retval;
- if (memchr(result, '\n', reslen) == NULL)
- tcl_output(connection, "\n", 1);
+ /* Always output ctrl-d as end of line to allow multiline results */
+ tcl_output(connection, "\x1a", 1);
}
tclc->tc_lineoffset = 0;