X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=05533aae3528554a4e2e24342cb98407204ee4ae;hb=a0b76360b874607f2aa075e764891f129b5ff0f9;hp=4d4dc2c83d1a9dd4156dc5b80cc7063192d1dc01;hpb=19f219f731f29503c8e4d432935d3ea558cc1659;p=openocd.git
diff --git a/src/openocd.c b/src/openocd.c
index 4d4dc2c83d..05533aae35 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ * along with this program. If not, see . *
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@ -47,8 +45,13 @@
#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"
@@ -294,8 +297,10 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
if (init_at_startup) {
ret = command_run_line(cmd_ctx, "init");
- if (ERROR_OK != ret)
+ if (ERROR_OK != ret) {
+ server_quit();
return ERROR_FAIL;
+ }
}
ret = server_loop(cmd_ctx);
@@ -328,7 +333,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);
@@ -339,11 +344,13 @@ int openocd_main(int argc, char *argv[])
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)