X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=54fc83a1729659c7d0785af0e59ca4d66f19bc6e;hp=048ce8524809e319579a68f163cec12bdb829b0e;hb=33a33553046bc720800f410adbc81bc2fb175e74;hpb=10fd274cfe5447fec8a4b8d3757787d086952deb
diff --git a/src/openocd.c b/src/openocd.c
index 048ce85248..54fc83a172 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -19,9 +19,7 @@
* GNU General Public License for more details. *
* *
* 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. *
+ * along with this program. If not, see . *
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@ -47,8 +45,18 @@
#include
#endif
+#ifdef PKGBLDDATE
#define OPENOCD_VERSION \
"Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
+#else
+#define OPENOCD_VERSION \
+ "Open On-Chip Debugger " VERSION RELSTR
+#endif
+
+static const char openocd_startup_tcl[] = {
+#include "startup_tcl.inc"
+0 /* Terminate with zero */
+};
/* Give scripts and TELNET a way to find out what version this is */
static int jim_version_command(Jim_Interp *interp, int argc,
@@ -228,8 +236,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
log_init();
LOG_DEBUG("log_init: complete");
- const char *startup = openocd_startup_tcl;
- struct command_context *cmd_ctx = command_init(startup, interp);
+ struct command_context *cmd_ctx = command_init(openocd_startup_tcl, interp);
/* register subsystem commands */
typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value);
@@ -273,30 +280,41 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
int ret;
if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK)
- return EXIT_FAILURE;
+ return ERROR_FAIL;
if (server_preinit() != ERROR_OK)
- return EXIT_FAILURE;
+ return ERROR_FAIL;
ret = parse_config_file(cmd_ctx);
- if (ret != ERROR_OK)
- return EXIT_FAILURE;
+ if (ret == ERROR_COMMAND_CLOSE_CONNECTION) {
+ server_quit(); /* gdb server may be initialized by -c init */
+ return ERROR_OK;
+ } else if (ret != ERROR_OK) {
+ server_quit(); /* gdb server may be initialized by -c init */
+ return ERROR_FAIL;
+ }
ret = server_init(cmd_ctx);
if (ERROR_OK != ret)
- return EXIT_FAILURE;
+ return ERROR_FAIL;
if (init_at_startup) {
ret = command_run_line(cmd_ctx, "init");
- if (ERROR_OK != ret)
- return EXIT_FAILURE;
+ if (ERROR_OK != ret) {
+ server_quit();
+ return ERROR_FAIL;
+ }
}
- server_loop(cmd_ctx);
+ ret = server_loop(cmd_ctx);
- server_quit();
+ int last_signal = server_quit();
+ if (last_signal != ERROR_OK)
+ return last_signal;
- return ret;
+ if (ret != ERROR_OK)
+ return ERROR_FAIL;
+ return ERROR_OK;
}
/* normally this is the main() function entry, but if OpenOCD is linked
@@ -318,7 +336,7 @@ int openocd_main(int argc, char *argv[])
return EXIT_FAILURE;
LOG_OUTPUT("For bug reports, read\n\t"
- "http://openocd.sourceforge.net/doc/doxygen/bugs.html"
+ "http://openocd.org/doc/doxygen/bugs.html"
"\n");
command_context_mode(cmd_ctx, COMMAND_CONFIG);
@@ -327,12 +345,22 @@ int openocd_main(int argc, char *argv[])
/* Start the executable meat that can evolve into thread in future. */
ret = openocd_thread(argc, argv, cmd_ctx);
+ gdb_service_free();
+ server_free();
+
unregister_all_commands(cmd_ctx, NULL);
- /* free commandline interface */
- command_done(cmd_ctx);
+ /* Shutdown commandline interface */
+ command_exit(cmd_ctx);
adapter_quit();
+ free_config();
+
+ if (ERROR_FAIL == ret)
+ return EXIT_FAILURE;
+ else if (ERROR_OK != ret)
+ exit_on_signal(ret);
+
return ret;
}