summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/helper/command.c8
-rw-r--r--src/server/server.c3
2 files changed, 6 insertions, 5 deletions
diff --git a/src/helper/command.c b/src/helper/command.c
index 0a120b10..3cf531b7 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -374,7 +374,12 @@ int find_and_run_command(command_context_t *context, command_t *commands, char *
{
command_print(context, "Syntax error:");
command_print_help_line(context, c, 0);
- } else if (retval != ERROR_OK)
+ }
+ else if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
+ {
+ /* just fall through for a shutdown request */
+ }
+ else if (retval != ERROR_OK)
{
/* we do not print out an error message because the command *should*
* have printed out an error
@@ -558,7 +563,6 @@ int command_print_help(command_context_t* context, char* name, char** args, int
return command_print_help_match(context, context->commands, name, args, argc);
}
-
void command_set_output_handler(command_context_t* context, int (*output_handler)(struct command_context_s *context, char* line), void *priv)
{
context->output_handler = output_handler;
diff --git a/src/server/server.c b/src/server/server.c
index 21a8ebab..fb003624 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -462,7 +462,6 @@ int server_init()
signal(SIGBREAK, sig_handler);
signal(SIGABRT, sig_handler);
#endif
-
return ERROR_OK;
}
@@ -494,5 +493,3 @@ int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char *
return ERROR_COMMAND_CLOSE_CONNECTION;
}
-
-