return cmd_ctx;
}
-static struct command *command_root(struct command *c)
-{
- while (NULL != c->parent)
- c = c->parent;
- return c;
-}
-
/**
* Find a command by name from a list of commands.
* @returns Returns the named command if it exists in the list.
static int command_unknown(Jim_Interp *interp, int argc, Jim_Obj *const *argv);
-static int register_command_handler(struct command_context *cmd_ctx,
- struct command *c)
-{
- Jim_Interp *interp = cmd_ctx->interp;
-
-#if 0
- LOG_DEBUG("registering '%s'...", c->name);
-#endif
-
- return Jim_CreateCommand(interp, c->name, command_unknown, c, NULL);
-}
-
static struct command *register_command(struct command_context *context,
struct command *parent, const struct command_registration *cr)
{
if (NULL == c)
return NULL;
- if (cr->jim_handler || cr->handler) {
- int retval = register_command_handler(context, command_root(c));
- if (retval != JIM_OK) {
- unregister_command(context, parent, name);
- return NULL;
- }
+ char *full_name = command_name(c, ' ');
+ LOG_DEBUG("registering '%s'...", full_name);
+ int retval = Jim_CreateCommand(context->interp, full_name,
+ command_unknown, c, NULL);
+ if (retval != JIM_OK) {
+ unregister_command(context, parent, name);
+ return NULL;
}
return c;
}
return __command_name(c, delim, 0);
}
-static bool command_can_run(struct command_context *cmd_ctx, struct command *c)
+static bool command_can_run(struct command_context *cmd_ctx, struct command *c, const char *full_name)
{
if (c->mode == COMMAND_ANY || c->mode == cmd_ctx->mode)
return true;
when = "if Cthulhu is summoned by";
break;
}
- char *full_name = command_name(c, ' ');
LOG_ERROR("The '%s' command must be used %s 'init'.",
full_name ? full_name : c->name, when);
- free(full_name);
return false;
}
return all;
}
-static int run_usage(Jim_Interp *interp, int argc_valid, int argc, Jim_Obj * const *argv)
-{
- struct command_context *cmd_ctx = current_command_context(interp);
- char *command;
- int retval;
-
- assert(argc_valid >= 1);
- assert(argc >= argc_valid);
-
- command = alloc_concatenate_strings(argc_valid, argv);
- if (!command)
- return JIM_ERR;
-
- retval = command_run_linef(cmd_ctx, "usage %s", command);
- if (retval != ERROR_OK) {
- LOG_ERROR("unable to execute command \"usage %s\"", command);
- return JIM_ERR;
- }
-
- if (argc_valid == argc)
- LOG_ERROR("%s: command requires more arguments", command);
- else {
- free(command);
- command = alloc_concatenate_strings(argc - argc_valid, argv + argc_valid);
- if (!command)
- return JIM_ERR;
- LOG_ERROR("invalid subcommand \"%s\"", command);
- }
-
- free(command);
- return retval;
-}
-
static int exec_command(Jim_Interp *interp, struct command_context *cmd_ctx,
- struct command *c, int argc, Jim_Obj *const *argv)
+ struct command *c, int argc, Jim_Obj * const *argv)
{
if (c->jim_handler)
return c->jim_handler(interp, argc, argv);
{
script_debug(interp, argc, argv);
- struct command_context *cmd_ctx = current_command_context(interp);
- struct command *c = cmd_ctx->commands;
- int remaining = command_unknown_find(argc, argv, c, &c);
- /* if nothing could be consumed, then it's really an unknown command */
- if (remaining == argc) {
- const char *cmd = Jim_GetString(argv[0], NULL);
- LOG_ERROR("Unknown command:\n %s", cmd);
- return JIM_OK;
+ /* check subcommands */
+ if (argc > 1) {
+ char *s = alloc_printf("%s %s", Jim_GetString(argv[0], NULL), Jim_GetString(argv[1], NULL));
+ Jim_Obj *js = Jim_NewStringObj(interp, s, -1);
+ Jim_IncrRefCount(js);
+ free(s);
+ Jim_Cmd *cmd = Jim_GetCommand(interp, js, JIM_NONE);
+ if (cmd) {
+ int retval = Jim_EvalObjPrefix(interp, js, argc - 2, argv + 2);
+ Jim_DecrRefCount(interp, js);
+ return retval;
+ }
+ Jim_DecrRefCount(interp, js);
}
- Jim_Obj *const *start;
- unsigned count;
- if (c->handler || c->jim_handler) {
- /* include the command name in the list */
- count = remaining + 1;
- start = argv + (argc - remaining - 1);
- } else {
- count = argc - remaining;
- start = argv;
- run_usage(interp, count, argc, start);
+ struct command *c = jim_to_command(interp);
+ if (!c->jim_handler && !c->handler) {
+ Jim_EvalObjPrefix(interp, Jim_NewStringObj(interp, "usage", -1), 1, argv);
return JIM_ERR;
}
- if (!command_can_run(cmd_ctx, c))
+ struct command_context *cmd_ctx = current_command_context(interp);
+
+ if (!command_can_run(cmd_ctx, c, Jim_GetString(argv[0], NULL)))
return JIM_ERR;
target_call_timer_callbacks_now();
if (c->jim_override_target)
cmd_ctx->current_target_override = c->jim_override_target;
- int retval = exec_command(interp, cmd_ctx, c, count, start);
+ int retval = exec_command(interp, cmd_ctx, c, argc, argv);
if (c->jim_override_target)
cmd_ctx->current_target_override = saved_target_override;