command: fix leak when executing commands

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 69ed7601e63689343f9256e330b3a6868dc93fcd..62b22389a9b68fe2fa7d2de6992840ab9043b518 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007-2010 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008 Richard Missenden                                  *
@@ -42,7 +42,6 @@
 
 #include <server/server.h>
 #include <server/gdb_server.h>
-#include <server/httpd.h>
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -52,15 +51,29 @@
 #define OPENOCD_VERSION \
                "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
 
-/* Give TELNET a way to find out what version this is */
-COMMAND_HANDLER(handle_version_command)
+/* Give scripts and TELNET a way to find out what version this is */
+static int jim_version_command(Jim_Interp *interp, int argc,
+               Jim_Obj * const *argv)
 {
-       if (CMD_ARGC != 0)
-               return ERROR_COMMAND_SYNTAX_ERROR;
-
-       command_print(CMD_CTX, OPENOCD_VERSION);
+       if (argc > 2)
+       {
+               return JIM_ERR;
+       }
+       const char *str = "";
+       char * version_str;
+       version_str = OPENOCD_VERSION;
+       
+       if (argc == 2)
+               str = Jim_GetString(argv[1], NULL);
+
+       if (strcmp("git", str) == 0)
+       {
+               version_str = GITVERSION;
+       } 
+       
+       Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1));
 
-       return ERROR_OK;
+       return JIM_OK;
 }
 
 static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv)
@@ -171,10 +184,33 @@ COMMAND_HANDLER(handle_add_script_search_dir_command)
        return ERROR_OK;
 }
 
+
+static int jim_stacktrace_command(Jim_Interp *interp, int argc,
+               Jim_Obj * const *argv)
+{
+       if (argc != 1)
+       {
+               return JIM_ERR;
+       }
+       Jim_Obj * stacktrace = Jim_DuplicateObj(interp, interp->stackTrace);
+       
+       /* insert actual error site at beginning of list*/
+       Jim_Obj *procname = Jim_NewStringObj(interp, "", -1); /* Uhhh... don't know this one. */
+       Jim_ListInsertElements(interp, stacktrace, 0, 1, &procname);
+       Jim_Obj *filename = Jim_NewStringObj(interp, interp->errorFileName, -1);
+       Jim_ListInsertElements(interp, stacktrace, 1, 1, &filename);
+       Jim_Obj *line = Jim_NewIntObj(interp, interp->errorLine);
+       Jim_ListInsertElements(interp, stacktrace, 2, 1, &line);
+
+       Jim_SetResult(interp, stacktrace);
+
+       return JIM_OK;
+}
+
 static const struct command_registration openocd_command_handlers[] = {
        {
                .name = "version",
-               .handler = &handle_version_command,
+               .jim_handler = jim_version_command,
                .mode = COMMAND_ANY,
                .help = "show program version",
        },
@@ -201,6 +237,14 @@ static const struct command_registration openocd_command_handlers[] = {
                .help = "dir to search for config files and scripts",
 
        },
+       {
+               .name = "stacktrace",
+               .jim_handler = jim_stacktrace_command,
+               .mode = COMMAND_ANY,
+               .help = "returns the stacktrace as a list of triples: proc, file, line."
+               "The stack trace is reset when a new stack trace is being built after "
+               "a new failure has occurred.",
+       },
        COMMAND_REGISTRATION_DONE
 };
 
@@ -223,7 +267,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
        struct command_context *cmd_ctx = command_init(startup, interp);
 
        /* register subsystem commands */
-       typedef int (*command_registrant_t)(struct command_context *cmd_ctx);
+       typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value);
        static const command_registrant_t command_registrants[] = {
                &openocd_register_commands,
                &server_register_commands,
@@ -292,13 +336,14 @@ int openocd_main(int argc, char *argv[])
        if (ret != ERROR_OK)
                return EXIT_FAILURE;
 
-       if (httpd_start(cmd_ctx) != ERROR_OK)
-               return EXIT_FAILURE;
-
        ret = server_init(cmd_ctx);
        if (ERROR_OK != ret)
                return EXIT_FAILURE;
 
+       ret = command_run_line(cmd_ctx, "init_targets");
+       if (ERROR_OK != ret)
+               ret = EXIT_FAILURE;
+
        if (init_at_startup)
        {
                ret = command_run_line(cmd_ctx, "init");
@@ -312,8 +357,6 @@ int openocd_main(int argc, char *argv[])
 
        server_quit();
 
-       httpd_stop();
-
        unregister_all_commands(cmd_ctx, NULL);
 
        /* free commandline interface */