tcl regression fixes.

git-svn-id: svn://svn.berlios.de/openocd/trunk@774 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/openocd.c b/src/openocd.c
index 793dbbc6813f4a8f40af04ec75f15292a30ee125..4698fc1603af30e3ee429df0cc115a4d5333b624 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -392,7 +392,7 @@ int jim_command(command_context_t *context, char *line)
                                chunk = reslen - i;
                                if (chunk > 256)
                                        chunk = 256;
-                               strncpy(buff, result, chunk);
+                       strncpy(buff, result+i, chunk);
                                buff[chunk] = 0; 
                                LOG_USER_N("%s", buff);
                        }
@@ -607,18 +607,6 @@ command_context_t *setup_command_handler(void)
        LOG_OUTPUT( OPENOCD_VERSION "\n" );
        
        
-       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-       LOG_OUTPUT( "$URL$\n");
-       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-
        register_command(cmd_ctx, NULL, "init", handle_init_command,
                                         COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
 
@@ -644,6 +632,18 @@ int openocd_main(int argc, char *argv[])
        command_context_t *cmd_ctx;
        cmd_ctx=setup_command_handler();
        
+       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
+       LOG_OUTPUT( "$URL$\n");
+       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+       /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
+
        command_context_t *cfg_cmd_ctx;
        cfg_cmd_ctx = copy_command_context(cmd_ctx);
        cfg_cmd_ctx->mode = COMMAND_CONFIG;

diff --git a/src/target/target.c b/src/target/target.c
index 9843ad070914d593cf6b9bcd2989460fba7aac4b..082b5cb56d2ca316588ba2b5aa4b595dad0cbc8b 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1494,7 +1494,7 @@ int handle_target_script_command(struct command_context_s *cmd_ctx, char *cmd, c
        /* Define a tcl procedure which we'll invoke upon some event */
        command_run_linef(cmd_ctx, 
        "proc target_%s_%d {} {"
-       "openocd {script %s}" 
+       "openocd {script %s} ; return \"\"" 
        "}",
        event,
        get_num_by_target(target),