diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-08-20 10:22:48 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-08-30 20:57:20 +0200 |
commit | 6ce1c664deedc932093d2750c37f509b067bf551 (patch) | |
tree | a1dbed529a6f43021d8676b38566086d6b89bf3b /commands | |
parent | b712b26632d4af1e1c9454a3b330ed7b401e165b (diff) | |
download | barebox-6ce1c664deedc932093d2750c37f509b067bf551.tar.gz barebox-6ce1c664deedc932093d2750c37f509b067bf551.tar.xz |
Menu/cmd: add sub menu entry command support
this will simplify the creation of navigation link
as this
menu -a -m boot -d "Boot Menu"
menu -a -m network -d "Network settings"
menu -e -a -m network -u boot -d "Back"
menu -e -a -m boot -u network -d "Network settings ->"
menu -e -a -m boot -c reset -R -d "Reset"
menu -e -a -m boot -c clear -d "Exit"
menu -s -m boot
in C
struct menu m_boot = {
.name = "boot",
.display = "Boot Menu",
};
struct menu m_network = {
.name = "network",
.display = "Network settings",
};
struct menu_entry e_to_network = {
.display = "Network settings ->",
.action = menu_action_show,
.priv = &m_network,
};
struct menu_entry e_to_boot = {
.display = "Back",
.action = menu_action_show,
.priv = &m_boot,
};
struct menu_entry e_reset = {
.display = "Reset",
.action = menu_action_run,
.priv = "reset",
};
struct menu_entry e_exit = {
.display = "Exit",
.action = menu_action_run,
.non_re_ent = 1,
.priv = "clear",
};
void menu_test(void)
{
menu_add(&m_boot);
menu_add(&m_network);
menu_add_entry(&m_boot, &e_to_network);
menu_add_entry(&m_boot, &e_reset);
menu_add_entry(&m_boot, &e_exit);
menu_add_entry(&m_network, &e_to_boot);
menu_show(&m_boot);
}
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
-rw-r--r-- | commands/menu.c | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/commands/menu.c b/commands/menu.c index c1bd0e2a44..237de9fc17 100644 --- a/commands/menu.c +++ b/commands/menu.c @@ -45,12 +45,13 @@ struct cmd_menu { int re_entrant; char *description; char *command; + char *submenu; int num; #endif }; #if defined(CONFIG_CMD_MENU_MANAGEMENT) -#define OPTS "m:earlc:d:RsSn:" +#define OPTS "m:earlc:d:RsSn:u:" #define is_entry(x) ((x)->entry) #else #define OPTS "m:ls" @@ -60,15 +61,16 @@ struct cmd_menu { #if defined(CONFIG_CMD_MENU_MANAGEMENT) /* * menu -e -a -m <menu> -c <command> [-R] -d <description> + * menu -e -a -m <menu> -u submenu -d <description> */ static int do_menu_entry_add(struct cmd_menu *cm) { struct menu_entry *me; - struct menu *m; + struct menu *m, *sm; int len; int ret = -ENOMEM; - if (!cm->menu || !cm->command || !cm->description) + if (!cm->menu || (!cm->command && !cm->submenu) || !cm->description) return -EINVAL; m = menu_get_by_name(cm->menu); @@ -83,16 +85,29 @@ static int do_menu_entry_add(struct cmd_menu *cm) if (!me) goto free; - me->action = menu_action_run; + if (cm->submenu) { + me->action = menu_action_show; - len = strlen(cm->command) + 1; + sm = menu_get_by_name(cm->submenu); - me->priv = calloc(len, sizeof(char)); + if (!sm) { + eprintf("SubMenu '%s' not found\n", cm->menu); + goto free; + } - if (!me->priv) - goto free; + me->priv = sm; + } else { + me->action = menu_action_run; + + len = strlen(cm->command) + 1; + + me->priv = calloc(len, sizeof(char)); - strncpy(me->priv, cm->command, len); + if (!me->priv) + goto free; + + strncpy(me->priv, cm->command, len); + } len = strlen(cm->description) + 1; @@ -371,6 +386,9 @@ static int do_menu(struct command *cmdtp, int argc, char *argv[]) case 'c': cm.command = optarg; break; + case 'u': + cm.submenu = optarg; + break; case 'd': cm.description = optarg; break; @@ -453,6 +471,10 @@ static const __maybe_unused char cmd_menu_help[] = "Add an entry\n" " (-R for do no exit the menu after executing the command)\n" " menu -e -a -m <menu> -c <command> [-R] -d <description>\n" + +"Add a submenu entry\n" +" (-R is not needed)\n" +" menu -e -a -m <menu> -u <menu> -d <description>\n" "\n" "Remove an entry\n" " menu -e -r -m <name> -n <num>\n" |