use COMMAND_PARSE_ENABLE macro where appropriate

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

diff --git a/src/helper/command.c b/src/helper/command.c
index b9d0d087ad4f873ac61a6ce37e08e38f48de05d8..708a8024f291927f227cab17103aec495d9a9b0b 100644 (file)
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -438,7 +438,6 @@ char *command_name(struct command *c, char delim)
 static int run_command(struct command_context *context,
                struct command *c, const char *words[], unsigned num_words)
 {
-       int start_word = 0;
        if (!((context->mode == COMMAND_CONFIG) || (c->mode == COMMAND_ANY) || (c->mode == context->mode)))
        {
                /* Config commands can not run after the config stage */
@@ -449,8 +448,8 @@ static int run_command(struct command_context *context,
        struct command_invocation cmd = {
                        .ctx = context,
                        .name = c->name,
-                       .argc = num_words - start_word - 1,
-                       .argv = words + start_word + 1,
+                       .argc = num_words - 1,
+                       .argv = words + 1,
                };
        int retval = c->handler(&cmd);
        if (retval == ERROR_COMMAND_SYNTAX_ERROR)
@@ -767,10 +766,9 @@ COMMAND_HANDLER(handle_fast_command)
 }
 
 
-struct command_context* command_init()
+struct command_context* command_init(const char *startup_tcl)
 {
        struct command_context* context = malloc(sizeof(struct command_context));
-       extern const char startup_tcl[];
        const char *HostOs;
 
        context->mode = COMMAND_EXEC;