int fast_and_dangerous = 0;
Jim_Interp *interp = NULL;
-static int run_command(command_context_t *context,
- command_t *c, const char *words[], unsigned num_words);
+static int run_command(struct command_context *context,
+ struct command *c, const char *words[], unsigned num_words);
static void tcl_output(void *privData, const char *file, unsigned line,
const char *function, const char *string)
Jim_AppendString(interp, tclOutput, string, strlen(string));
}
-extern command_context_t *global_cmd_ctx;
+extern struct command_context *global_cmd_ctx;
void script_debug(Jim_Interp *interp, const char *name,
unsigned argc, Jim_Obj *const *argv)
static int script_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
/* the private data is stashed in the interp structure */
- command_t *c;
- command_context_t *context;
+ struct command *c;
+ struct command_context *context;
int retval;
int i;
int nwords;
script_debug(interp, c->name, argc, argv);
- words = malloc(sizeof(char *) * (argc + 1));
- words[0] = c->name;
+ words = malloc(argc * sizeof(char *));
for (i = 0; i < argc; i++)
{
int len;
/* hit an end of line comment */
break;
}
- words[i + 1] = strdup(w);
- if (words[i + 1] == NULL)
+ words[i] = strdup(w);
+ if (words[i] == NULL)
{
int j;
for (j = 0; j < i; j++)
- free(words[j + 1]);
+ free(words[j]);
free(words);
return JIM_ERR;
}
log_add_callback(tcl_output, tclOutput);
- // turn words[0] into args[-1] with this cast
- retval = run_command(context, c, (const char **)words + 1, nwords);
+ // turn words[0] into CMD_ARGV[-1] with this cast
+ retval = run_command(context, c, (const char **)words, nwords);
log_remove_callback(tcl_output, tclOutput);
Jim_DecrRefCount(interp, tclOutput);
for (i = 0; i < nwords; i++)
- free(words[i + 1]);
+ free(words[i]);
free(words);
int *return_retval = Jim_GetAssocData(interp, "retval");
return (retval == ERROR_OK)?JIM_OK:JIM_ERR;
}
-static Jim_Obj *command_name_list(struct command_s *c)
+static Jim_Obj *command_name_list(struct command *c)
{
Jim_Obj *cmd_list = c->parent ?
command_name_list(c->parent) :
* Find a command by name from a list of commands.
* @returns The named command if found, or NULL.
*/
-static struct command_s *command_find(struct command_s **head, const char *name)
+static struct command *command_find(struct command **head, const char *name)
{
assert(head);
- for (struct command_s *cc = *head; cc; cc = cc->next)
+ for (struct command *cc = *head; cc; cc = cc->next)
{
if (strcmp(cc->name, name) == 0)
return cc;
* @returns Returns false if the named command already exists in the list.
* Returns true otherwise.
*/
-static void command_add_child(struct command_s **head, struct command_s *c)
+static void command_add_child(struct command **head, struct command *c)
{
assert(head);
if (NULL == *head)
*head = c;
return;
}
- struct command_s *cc = *head;
+ struct command *cc = *head;
while (cc->next) cc = cc->next;
cc->next = c;
}
-command_t* register_command(command_context_t *context,
- command_t *parent, char *name, command_handler_t handler,
+struct command* register_command(struct command_context *context,
+ struct command *parent, char *name, command_handler_t handler,
enum command_mode mode, char *help)
{
if (!context || !name)
return NULL;
- struct command_s **head = parent ? &parent->children : &context->commands;
- struct command_s *c = command_find(head, name);
+ struct command **head = parent ? &parent->children : &context->commands;
+ struct command *c = command_find(head, name);
if (NULL != c)
return c;
- c = malloc(sizeof(command_t));
+ c = malloc(sizeof(struct command));
c->name = strdup(name);
c->parent = parent;
return c;
}
-int unregister_all_commands(command_context_t *context)
+int unregister_all_commands(struct command_context *context)
{
- command_t *c, *c2;
+ struct command *c, *c2;
if (context == NULL)
return ERROR_OK;
return ERROR_OK;
}
-int unregister_command(command_context_t *context, char *name)
+int unregister_command(struct command_context *context, char *name)
{
- command_t *c, *p = NULL, *c2;
+ struct command *c, *p = NULL, *c2;
if ((!context) || (!name))
return ERROR_INVALID_ARGUMENTS;
return ERROR_OK;
}
-void command_output_text(command_context_t *context, const char *data)
+void command_output_text(struct command_context *context, const char *data)
{
if (context && context->output_handler && data) {
context->output_handler(context, data);
}
}
-void command_print_sameline(command_context_t *context, const char *format, ...)
+void command_print_sameline(struct command_context *context, const char *format, ...)
{
char *string;
va_end(ap);
}
-void command_print(command_context_t *context, const char *format, ...)
+void command_print(struct command_context *context, const char *format, ...)
{
char *string;
va_end(ap);
}
-static char *__command_name(struct command_s *c, char delim, unsigned extra)
+static char *__command_name(struct command *c, char delim, unsigned extra)
{
char *name;
unsigned len = strlen(c->name);
}
return name;
}
-char *command_name(struct command_s *c, char delim)
+char *command_name(struct command *c, char delim)
{
return __command_name(c, delim, 0);
}
-static int run_command(command_context_t *context,
- command_t *c, const char *words[], unsigned num_words)
+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 */
return ERROR_FAIL;
}
- unsigned argc = num_words - start_word - 1;
- const char **args = words + start_word + 1;
- int retval = c->handler(context, args, argc);
+ struct command_invocation cmd = {
+ .ctx = context,
+ .name = c->name,
+ .argc = num_words - 1,
+ .argv = words + 1,
+ };
+ int retval = c->handler(&cmd);
if (retval == ERROR_COMMAND_SYNTAX_ERROR)
{
/* Print help for command */
return retval;
}
-int command_run_line(command_context_t *context, char *line)
+int command_run_line(struct command_context *context, char *line)
{
/* all the parent commands have been registered with the interpreter
* so, can just evaluate the line as a script and check for
return retval;
}
-int command_run_linef(command_context_t *context, const char *format, ...)
+int command_run_linef(struct command_context *context, const char *format, ...)
{
int retval = ERROR_FAIL;
char *string;
return retval;
}
-void command_set_output_handler(command_context_t* context,
+void command_set_output_handler(struct command_context* context,
command_output_handler_t output_handler, void *priv)
{
context->output_handler = output_handler;
context->output_handler_priv = priv;
}
-command_context_t* copy_command_context(command_context_t* context)
+struct command_context* copy_command_context(struct command_context* context)
{
- command_context_t* copy_context = malloc(sizeof(command_context_t));
+ struct command_context* copy_context = malloc(sizeof(struct command_context));
*copy_context = *context;
return copy_context;
}
-int command_done(command_context_t *context)
+int command_done(struct command_context *context)
{
free(context);
context = NULL;
COMMAND_HANDLER(handle_sleep_command)
{
bool busy = false;
- if (argc == 2)
+ if (CMD_ARGC == 2)
{
- if (strcmp(args[1], "busy") == 0)
+ if (strcmp(CMD_ARGV[1], "busy") == 0)
busy = true;
else
return ERROR_COMMAND_SYNTAX_ERROR;
}
- else if (argc < 1 || argc > 2)
+ else if (CMD_ARGC < 1 || CMD_ARGC > 2)
return ERROR_COMMAND_SYNTAX_ERROR;
unsigned long duration = 0;
- int retval = parse_ulong(args[0], &duration);
+ int retval = parse_ulong(CMD_ARGV[0], &duration);
if (ERROR_OK != retval)
return retval;
COMMAND_HANDLER(handle_fast_command)
{
- if (argc != 1)
+ if (CMD_ARGC != 1)
return ERROR_COMMAND_SYNTAX_ERROR;
- fast_and_dangerous = strcmp("enable", args[0]) == 0;
+ fast_and_dangerous = strcmp("enable", CMD_ARGV[0]) == 0;
return ERROR_OK;
}
-command_context_t* command_init()
+struct command_context* command_init(const char *startup_tcl)
{
- command_context_t* context = malloc(sizeof(command_context_t));
- extern const char startup_tcl[];
+ struct command_context* context = malloc(sizeof(struct command_context));
const char *HostOs;
context->mode = COMMAND_EXEC;
return context;
}
-int command_context_mode(command_context_t *cmd_ctx, enum command_mode mode)
+int command_context_mode(struct command_context *cmd_ctx, enum command_mode mode)
{
if (!cmd_ctx)
return ERROR_INVALID_ARGUMENTS;
#endif
}
-void register_jim(struct command_context_s *cmd_ctx, const char *name, int (*cmd)(Jim_Interp *interp, int argc, Jim_Obj *const *argv), const char *help)
+void register_jim(struct command_context *cmd_ctx, const char *name,
+ Jim_CmdProc cmd, const char *help)
{
Jim_CreateCommand(interp, name, cmd, NULL, NULL);
projects / openocd / blobdiff