X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=d17af20fe9f43fc04f37ee73e4b019a75b1b453f;hp=b0dd21ab2c82bd7a72e038d7801b37bf97eeff42;hb=72466de39931cbe872db367c878c5ed17a4b67f3;hpb=5087a9554851cd7e1d33d13deb0f5d35b89369f6

diff --git a/src/openocd.c b/src/openocd.c
index b0dd21ab2c..d17af20fe9 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -283,7 +283,9 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
 		return ERROR_FAIL;
 
 	ret = parse_config_file(cmd_ctx);
-	if (ret != ERROR_OK)
+	if (ret == ERROR_COMMAND_CLOSE_CONNECTION)
+		return ERROR_OK;
+	else if (ret != ERROR_OK)
 		return ERROR_FAIL;
 
 	ret = server_init(cmd_ctx);
@@ -296,9 +298,15 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
 			return ERROR_FAIL;
 	}
 
-	server_loop(cmd_ctx);
+	ret = server_loop(cmd_ctx);
+
+	int last_signal = server_quit();
+	if (last_signal != ERROR_OK)
+		return last_signal;
 
-	return server_quit();
+	if (ret != ERROR_OK)
+		return ERROR_FAIL;
+	return ERROR_OK;
 }
 
 /* normally this is the main() function entry, but if OpenOCD is linked
@@ -320,7 +328,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);