X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=20a90483cd07accc318546d9fc26aab48c9f72dc;hp=72a056d2c6f93707fd867170a9d21e723b772480;hb=352f5c2729dc8b40524e45ddde4f560ded717ec8;hpb=c916e133367688075f568fed390b625b9325c68b;ds=sidebyside

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 72a056d..20a9048 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <locale.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/reboot.h>
@@ -963,8 +964,8 @@ fallback:
 	 * If this option was faked above move the context under
 	 * the item so it is cleaned up later in cui_plugins_remove().
 	 */
-	if (strncmp(cod->opt->id, "dummy", strlen("dummy") == 0 &&
-				cod->dev->type == DEVICE_TYPE_UNKNOWN)) {
+	if (strcmp(cod->opt->id, "dummy") == 0 &&
+			cod->dev->type == DEVICE_TYPE_UNKNOWN) {
 		talloc_steal(item, cod->dev);
 		talloc_steal(item, cod->opt);
 	}
@@ -1242,6 +1243,14 @@ static struct pmenu *main_menu_init(struct cui *cui)
 		return NULL;
 	}
 
+	m->n_hot_keys = 1;
+	m->hot_keys = talloc_array(m, hot_key_fn, m->n_hot_keys);
+	if (!m->hot_keys) {
+		pb_log("%s: failed to allocate hot_keys\n", __func__);
+		talloc_free(m);
+		return NULL;
+	}
+	m->hot_keys[0] = pmenu_main_hot_keys;
 	m->on_new = cui_item_new;
 
 	m->scr.frame.ltitle = talloc_asprintf(m,
@@ -1325,9 +1334,8 @@ static struct pmenu *plugin_menu_init(struct cui *cui)
 	int result;
 
 	m = pmenu_init(cui, 2, cui_plugin_menu_exit);
-	m->on_new = cui_item_new;
 	m->scr.frame.ltitle = talloc_asprintf(m, _("Petitboot Plugins"));
-	m->scr.frame.rtitle = talloc_asprintf(m, NULL);
+	m->scr.frame.rtitle = talloc_asprintf(m, "%s", "");
 	m->scr.frame.help = talloc_strdup(m,
 		_("Enter=install, e=details, x=exit, h=help"));
 	m->scr.frame.status = talloc_asprintf(m,
@@ -1566,7 +1574,8 @@ static void cui_cancel_autoboot_on_exit(struct cui *cui)
 
 int cui_run(struct cui *cui)
 {
-	assert(main);
+	assert(cui);
+	assert(cui->main);
 
 	cui->current = &cui->main->scr;
 	cui->default_item = 0;