summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-07-17 12:02:55 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-07-17 12:02:55 +0000
commit5fefa83d078bfea4338f4bb2112c5ef98c54656e (patch)
tree6fd67eb5284951992e3e2a29bc9a0d588e6d50d3 /src
parent5a3712072f995567ea1aa11fcce25b3158c2f9bf (diff)
downloadopenocd_libswd-5fefa83d078bfea4338f4bb2112c5ef98c54656e.tar.gz
openocd_libswd-5fefa83d078bfea4338f4bb2112c5ef98c54656e.tar.bz2
openocd_libswd-5fefa83d078bfea4338f4bb2112c5ef98c54656e.tar.xz
openocd_libswd-5fefa83d078bfea4338f4bb2112c5ef98c54656e.zip
Collect output from openocd commands into openocd_output local variable
git-svn-id: svn://svn.berlios.de/openocd/trunk@820 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/helper/command.c35
-rw-r--r--src/openocd.c53
-rw-r--r--src/startup.tcl8
3 files changed, 36 insertions, 60 deletions
diff --git a/src/helper/command.c b/src/helper/command.c
index d31c3588..31de2ec9 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -94,8 +94,9 @@ static int script_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
*retval = run_command(context, c, words, nwords);
log_remove_callback(tcl_output, tclOutput);
- Jim_SetResult(interp, tclOutput);
+ /* We dump output into this local variable */
+ Jim_SetVariableStr(interp, "openocd_output", tclOutput);
}
for (i = 0; i < nwords; i++)
@@ -295,7 +296,14 @@ void command_print_n(command_context_t *context, char *format, ...)
string = alloc_vprintf(format, ap);
if (string != NULL)
{
- context->output_handler(context, string);
+ /* we want this collected in the log + we also want to pick it up as a tcl return
+ * value.
+ *
+ * The latter bit isn't precisely neat, but will do for now.
+ */
+ LOG_USER_N("%s", string);
+ // We already printed it above
+ //command_output_text(context, string);
free(string);
}
@@ -313,7 +321,14 @@ void command_print(command_context_t *context, char *format, ...)
if (string != NULL)
{
strcat(string, "\n"); /* alloc_vprintf guaranteed the buffer to be at least one char longer */
- context->output_handler(context, string);
+ /* we want this collected in the log + we also want to pick it up as a tcl return
+ * value.
+ *
+ * The latter bit isn't precisely neat, but will do for now.
+ */
+ LOG_USER_N("%s", string);
+ // We already printed it above
+ //command_output_text(context, string);
free(string);
}
@@ -369,7 +384,6 @@ int command_run_line(command_context_t *context, char *line)
/* run the line thru a script engine */
int retval;
int retcode;
-
Jim_DeleteAssocData(interp, "context"); /* remove existing */
retcode = Jim_SetAssocData(interp, "context", NULL, context);
if (retcode != JIM_OK)
@@ -382,9 +396,20 @@ int command_run_line(command_context_t *context, char *line)
if (retcode != JIM_OK)
return ERROR_FAIL;
+ active_cmd_ctx = context;
retcode = Jim_Eval(interp, line);
if (retcode == JIM_ERR) {
- Jim_PrintErrorMessage(interp);
+ if (retval!=ERROR_COMMAND_CLOSE_CONNECTION)
+ {
+ /* We do not print the connection closed error message */
+ Jim_PrintErrorMessage(interp);
+ }
+ if (retval==ERROR_OK)
+ {
+ /* It wasn't a low level OpenOCD command that failed */
+ return ERROR_FAIL;
+ }
+ return retval;
} else if (retcode == JIM_EXIT) {
/* ignore. */
/* exit(Jim_GetExitCode(interp)); */
diff --git a/src/openocd.c b/src/openocd.c
index a3b0fe18..29b8d580 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -485,59 +485,6 @@ static int Jim_Command_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *a
}
-static int openocd_retval;
-
-/* try to execute as Jim command, otherwise fall back to standard command.
- * Note that even if the Jim command caused an error, then we succeeded
- * to execute it, hence this fn pretty much always returns ERROR_OK. */
-int jim_command(command_context_t *context, char *line)
-{
- int retval=ERROR_OK;
- int retcode;
-
- active_cmd_ctx = context;
- openocd_retval=ERROR_OK;
- retcode = Jim_Eval(interp, line);
-
- if (retcode == JIM_ERR) {
- if (openocd_retval!=ERROR_COMMAND_CLOSE_CONNECTION)
- {
- /* We do not print the connection closed error message */
- Jim_PrintErrorMessage(interp);
- }
- if (openocd_retval==ERROR_OK)
- {
- /* It wasn't a low level OpenOCD command that failed */
- return ERROR_FAIL;
- }
- return openocd_retval;
- }
- const char *result;
- int reslen;
- result = Jim_GetString(Jim_GetResult(interp), &reslen);
-
- if (retcode == JIM_EXIT) {
- /* ignore. */
- /* exit(Jim_GetExitCode(interp)); */
- } else {
- 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");
- }
- }
- return retval;
-}
/* find full path to file */
static int Jim_Command_find(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
diff --git a/src/startup.tcl b/src/startup.tcl
index 11ffe851..fc5f9e1a 100644
--- a/src/startup.tcl
+++ b/src/startup.tcl
@@ -95,12 +95,16 @@ add_help_text help "Tcl implementation of help command"
#a bit of backwards compatibility
proc openocd_throw {cmd} {
- return [eval $cmd]
+ set openocd_output ""
+ eval $cmd
+ return $openocd_output
}
#a bit of backwards compatibility
proc openocd {cmd} {
- return [eval $cmd]
+ set openocd_output ""
+ eval $cmd
+ return $openocd_output
}
# If a fn is unknown to Tcl, we try to execute it as an OpenOCD command