X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.c;h=54d82ff887196b817a20a4cbbac2777ec6c474e0;hp=3f09d62385b4df4043e985d965347aad13c905c1;hb=eac7fc04e7ce07f6b1a6a0d19af86ae7f74ebc5e;hpb=5acb43464206348b7cced9508852fdd2989aea58

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index 3f09d62..54d82ff 100644
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -123,6 +123,31 @@ static const char *pmenu_item_label(struct pmenu_item *item, const char *name)
 	return label;
 }
 
+/**
+ * pmenu_item_update - Update the label of an existing pmenu_item.
+ *
+ * The item array must be disconnected prior to calling.
+ */
+int pmenu_item_update(struct pmenu_item *item, const char *name)
+{
+	const char *label;
+	ITEM *i;
+
+	if (!item || !item->nci)
+		return -1;
+
+	label = pmenu_item_label(item, name);
+
+	if (!label)
+		return -1;
+
+	i = item->nci;
+	i->name.str = label;
+	i->name.length = strncols(label);
+
+	return 0;
+}
+
 /**
  * pmenu_item_create - Allocate and initialize a new pmenu_item instance.
  *
@@ -230,7 +255,7 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
 
 	for (i = 0; i < menu->item_count; i++) {
 		item = item_userptr(menu->items[i]);
-		cod = item->data;
+		cod = cod_from_item(item);
 		/* boot entries will have opt defined */
 		if (!cod || cod->opt)
 			continue;
@@ -285,6 +310,12 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
 				_("Network"), intf->name, hwaddr);
 		}
 		break;
+	case DEVICE_TYPE_ANY:
+		/* This is an option found from a file:// url, not associated
+		 * with any device */
+		snprintf(buf, sizeof(buf), "[Custom Local Options]");
+		matched = true;
+		break;
 
 	default:
 		/* Assume the device may be able to boot */
@@ -308,10 +339,9 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
 
 	/* We identify dev_hdr items as having a valid c->name,
 	 * but a NULL c->opt */
-	cod = talloc(dev_hdr, struct cui_opt_data);
+	cod = talloc_zero(dev_hdr, struct cui_opt_data);
 	cod->name = talloc_strdup(dev_hdr, opt->device_id);
 	cod->dev = dev;
-	cod->opt = NULL;
 	dev_hdr->data = cod;
 
 	pb_debug("%s: returning %s\n",__func__,cod->name);
@@ -322,9 +352,10 @@ static int pmenu_item_get_index(const struct pmenu_item *item)
 {
 	unsigned int i;
 
-	for (i = 0; i < item->pmenu->item_count; i++)
-		if (item->pmenu->items[i] == item->nci)
-			return i;
+	if (item)
+		for (i = 0; i < item->pmenu->item_count; i++)
+			if (item->pmenu->items[i] == item->nci)
+				return i;
 
 	pb_log("%s: not found: %p %s\n", __func__, item,
 		(item ? item->nci->name.str : "(null)"));
@@ -411,6 +442,9 @@ static void pmenu_process_key(struct nc_scr *scr, int key)
 	case 'l':
 		cui_show_lang(cui_from_arg(scr->ui_ctx));
 		break;
+	case 'g':
+		cui_show_statuslog(cui_from_arg(scr->ui_ctx));
+		break;
 	case KEY_F(1):
 	case 'h':
 		if (menu->help_text)