From 6f9eaaa00041eb2869ac701d851c358f14e726d5 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Sat, 14 Apr 2012 18:02:18 +0200 Subject: menu: enable the fancy color support only if HUSH is enabled So we can use the menu for the xloader too. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer --- common/menu.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'common/menu.c') diff --git a/common/menu.c b/common/menu.c index 50af36eebe..83821ec285 100644 --- a/common/menu.c +++ b/common/menu.c @@ -174,12 +174,17 @@ static void print_menu_entry(struct menu *m, struct menu_entry *me, puts(" "); } - process_escape_sequence(me->display, m->display_buffer, - m->display_buffer_size); + if (IS_ENABLED(CONFIG_SHELL_HUSH)) + process_escape_sequence(me->display, m->display_buffer, + m->display_buffer_size); + printf(" %d: ", me->num); if (selected) puts("\e[7m"); - puts(m->display_buffer); + if (IS_ENABLED(CONFIG_SHELL_HUSH)) + puts(m->display_buffer); + else + puts(me->display); if (selected) puts("\e[m"); @@ -236,9 +241,13 @@ static void print_menu(struct menu *m) clear(); gotoXY(1, 2); if(m->display) { - process_escape_sequence(m->display, m->display_buffer, - m->display_buffer_size); - puts(m->display_buffer); + if (IS_ENABLED(CONFIG_SHELL_HUSH)) { + process_escape_sequence(m->display, m->display_buffer, + m->display_buffer_size); + puts(m->display_buffer); + } else { + puts(m->display); + } } else { puts("Menu : "); puts(m->name); -- cgit v1.2.3