- remove error message on shutdown

[openocd.git] / src / helper / command.c

diff --git a/src/helper/command.c b/src/helper/command.c
index 31666e3a798a1ac7e9f8167fe374ac7d8ca26589..3cf531b7e6f6240b3b6b6a020b6f39c64c3d2cec 100644 (file)
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -143,6 +143,45 @@ command_t* register_command(command_context_t *context, command_t *parent, char
        return c;
 }
 
+int unregister_all_commands(command_context_t *context)
+{
+       command_t *c, *c2;
+       
+       unique_length_dirty = 1;
+       
+       if (context == NULL)
+               return ERROR_OK;
+       
+       
+       while(NULL != context->commands)
+       {
+               c = context->commands;
+               
+               while(NULL != c->children)
+               {
+                       c2 = c->children;
+                       c->children = c->children->next;
+                       free(c2->name);
+                       c2->name = NULL;
+                       free(c2->help);
+                       c2->help = NULL;
+                       free(c2);
+                       c2 = NULL;
+               }
+               
+               context->commands = context->commands->next;
+               
+               free(c->name);
+               c->name = NULL;
+               free(c->help);
+               c->help = NULL;
+               free(c);
+               c = NULL;               
+       }
+       
+       return ERROR_OK;
+}
+
 int unregister_command(command_context_t *context, char *name)
 {
        command_t *c, *p = NULL, *c2;
@@ -335,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
@@ -519,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;