X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-boot-editor.c;h=7fa1a42f0eddfbc07794b9f003c4dbfd330dfac6;hp=329699ab8ebdb6842369d9ad680cacf8e145907a;hb=86c9d34380b0074dab1ba89a569a94280d6999c4;hpb=8c60755607cbade935b1f763dffbf9ee1c38f97a

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 329699a..7fa1a42 100644
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -25,6 +25,7 @@
 
 #include "log/log.h"
 #include "talloc/talloc.h"
+#include "i18n/i18n.h"
 #include "nc-boot-editor.h"
 #include "nc-widgets.h"
 
@@ -42,6 +43,8 @@ struct boot_editor {
 	void			(*on_exit)(struct cui *cui,
 					struct pmenu_item *item,
 					struct pb_boot_data *bd);
+	bool			need_redraw;
+	bool			need_update;
 
 	int			label_x;
 	int			field_x;
@@ -60,6 +63,8 @@ struct boot_editor {
 		struct nc_widget_textbox	*dtb_f;
 		struct nc_widget_label		*args_l;
 		struct nc_widget_textbox	*args_f;
+		struct nc_widget_label		*args_sig_file_l;
+		struct nc_widget_textbox	*args_sig_file_f;
 		struct nc_widget_button		*ok_b;
 		struct nc_widget_button		*help_b;
 		struct nc_widget_button		*cancel_b;
@@ -70,9 +75,12 @@ struct boot_editor {
 	char			*initrd;
 	char			*dtb;
 	char			*args;
+	char			*args_sig_file;
+
+	bool			use_signature_files;
 };
 
-extern const char *boot_editor_help_text;
+extern const struct help_text boot_editor_help_text;
 
 static struct boot_editor *boot_editor_from_scr(struct nc_scr *scr)
 {
@@ -107,9 +115,19 @@ static struct boot_editor *boot_editor_from_arg(void *arg)
 static int boot_editor_post(struct nc_scr *scr)
 {
 	struct boot_editor *boot_editor = boot_editor_from_scr(scr);
-	widgetset_post(boot_editor->widgetset);
+
+	if (boot_editor->need_update) {
+		boot_editor_update(boot_editor, boot_editor->cui->sysinfo);
+		boot_editor->need_update = false;
+	} else {
+		widgetset_post(boot_editor->widgetset);
+	}
+
 	nc_scr_frame_draw(scr);
-	redrawwin(scr->main_ncw);
+	if (boot_editor->need_redraw) {
+		redrawwin(scr->main_ncw);
+		boot_editor->need_redraw = false;
+	}
 	wrefresh(boot_editor->scr.main_ncw);
 	pad_refresh(boot_editor);
 	return 0;
@@ -171,6 +189,10 @@ static struct pb_boot_data *boot_editor_prepare_data(
 
 	s = widget_textbox_get_value(boot_editor->widgets.image_f);
 	bd->image = conditional_prefix(bd, prefix, s);
+	if (!bd->image) {
+		talloc_free(bd);
+		return NULL;
+	}
 
 	s = widget_textbox_get_value(boot_editor->widgets.initrd_f);
 	bd->initrd = conditional_prefix(bd, prefix, s);
@@ -181,6 +203,15 @@ static struct pb_boot_data *boot_editor_prepare_data(
 	s = widget_textbox_get_value(boot_editor->widgets.args_f);
 	bd->args = *s ? talloc_strdup(bd, s) : NULL;
 
+	if (boot_editor->use_signature_files) {
+		s = widget_textbox_get_value(
+			boot_editor->widgets.args_sig_file_f);
+		bd->args_sig_file = conditional_prefix(bd, prefix, s);
+	}
+	else {
+		bd->args_sig_file = NULL;
+	}
+
 	return bd;
 }
 
@@ -214,14 +245,20 @@ static void boot_editor_process_key(struct nc_scr *scr, int key)
 	case STATE_SAVE:
 		item = boot_editor->item;
 		bd = boot_editor_prepare_data(boot_editor);
+		if (!bd) {
+			/* Incomplete entry */
+			boot_editor->state = STATE_EDIT;
+			break;
+		}
 		/* fall through */
 	case STATE_CANCEL:
 		boot_editor->on_exit(boot_editor->cui, item, bd);
 		break;
 	case STATE_HELP:
 		boot_editor->state = STATE_EDIT;
-		cui_show_help(boot_editor->cui, "Boot Option Editor",
-				boot_editor_help_text);
+		boot_editor->need_redraw = true;
+		cui_show_help(boot_editor->cui, _("Boot Option Editor"),
+				&boot_editor_help_text);
 		break;
 	default:
 		break;
@@ -300,11 +337,20 @@ static void boot_editor_layout_widgets(struct boot_editor *boot_editor)
 	y += layout_pair(boot_editor, y, boot_editor->widgets.args_l,
 					 boot_editor->widgets.args_f);
 
+	if (boot_editor->use_signature_files) {
+		y += layout_pair(boot_editor, y,
+					boot_editor->widgets.args_sig_file_l,
+					boot_editor->widgets.args_sig_file_f);
+	}
+
 
 	y++;
-	widget_move(widget_button_base(boot_editor->widgets.ok_b), y, 9);
-	widget_move(widget_button_base(boot_editor->widgets.help_b), y, 19);
-	widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 29);
+	widget_move(widget_button_base(boot_editor->widgets.ok_b), y,
+		    boot_editor->field_x);
+	widget_move(widget_button_base(boot_editor->widgets.help_b), y,
+		    boot_editor->field_x + 14);
+	widget_move(widget_button_base(boot_editor->widgets.cancel_b), y,
+		    boot_editor->field_x + 28);
 }
 
 static void boot_editor_widget_focus(struct nc_widget *widget, void *arg)
@@ -365,7 +411,7 @@ static void boot_editor_populate_device_select(struct boot_editor *boot_editor,
 	 * changed. */
 	selected = !boot_editor->selected_device;
 
-	widget_select_add_option(select, -1, "Specify paths/URLs manually",
+	widget_select_add_option(select, -1, _("Specify paths/URLs manually"),
 			selected);
 }
 
@@ -419,6 +465,11 @@ static void boot_editor_find_device(struct boot_editor *boot_editor,
 	if (bd->dtb && !path_on_device(bd_info, bd->dtb))
 		return;
 
+	if (boot_editor->use_signature_files)
+		if (bd->args_sig_file && !path_on_device(bd_info,
+			bd->args_sig_file))
+			return;
+
 	/* ok, we match; preselect the device option, and remove the common
 	 * prefix */
 	boot_editor->selected_device = bd_info->name;
@@ -428,6 +479,9 @@ static void boot_editor_find_device(struct boot_editor *boot_editor,
 		boot_editor->initrd += len;
 	if (boot_editor->dtb)
 		boot_editor->dtb += len;
+	if (boot_editor->use_signature_files)
+		if (boot_editor->args_sig_file)
+			boot_editor->args_sig_file += len;
 }
 
 static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
@@ -445,7 +499,8 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
 	widgetset_set_widget_focus(boot_editor->widgetset,
 			boot_editor_widget_focus, boot_editor);
 
-	boot_editor->widgets.device_l = widget_new_label(set, 0, 0, "Device:");
+	boot_editor->widgets.device_l = widget_new_label(set, 0, 0,
+			_("Device:"));
 	boot_editor->widgets.device_f = widget_new_select(set, 0, 0,
 						field_size);
 	widget_select_on_change(boot_editor->widgets.device_f,
@@ -454,32 +509,43 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
 	boot_editor_populate_device_select(boot_editor, sysinfo);
 
 	boot_editor->widgets.image_l = widget_new_label(set, 0, 0,
-			"Kernel:");
+			_("Kernel:"));
 	boot_editor->widgets.image_f = widget_new_textbox(set, 0, 0,
 						field_size, boot_editor->image);
 
 	boot_editor->widgets.initrd_l = widget_new_label(set, 0, 0,
-			"Initrd:");
+			_("Initrd:"));
 	boot_editor->widgets.initrd_f = widget_new_textbox(set, 0, 0,
 						field_size,
 						boot_editor->initrd);
 
 	boot_editor->widgets.dtb_l = widget_new_label(set, 0, 0,
-			"Device tree:");
+			_("Device tree:"));
 	boot_editor->widgets.dtb_f = widget_new_textbox(set, 0, 0,
 						field_size, boot_editor->dtb);
 
 	boot_editor->widgets.args_l = widget_new_label(set, 0, 0,
-			"Boot arguments:");
+			_("Boot arguments:"));
 	boot_editor->widgets.args_f = widget_new_textbox(set, 0, 0,
 					field_size, boot_editor->args);
 
-	boot_editor->widgets.ok_b = widget_new_button(set, 0, 0, 6,
-					"OK", ok_click, boot_editor);
-	boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 6,
-					"Help", help_click, boot_editor);
-	boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 6,
-					"Cancel", cancel_click, boot_editor);
+	if (boot_editor->use_signature_files) {
+		boot_editor->widgets.args_sig_file_l = widget_new_label(set,
+				0, 0, _("Argument signature file:"));
+		boot_editor->widgets.args_sig_file_f = widget_new_textbox(set,
+				0, 0, field_size, boot_editor->args_sig_file);
+	}
+	else {
+		boot_editor->widgets.args_sig_file_l = NULL;
+		boot_editor->widgets.args_sig_file_f = NULL;
+	}
+
+	boot_editor->widgets.ok_b = widget_new_button(set, 0, 0, 10,
+					_("OK"), ok_click, boot_editor);
+	boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 10,
+					_("Help"), help_click, boot_editor);
+	boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 10,
+					_("Cancel"), cancel_click, boot_editor);
 }
 
 void boot_editor_update(struct boot_editor *boot_editor,
@@ -487,6 +553,11 @@ void boot_editor_update(struct boot_editor *boot_editor,
 {
 	int height;
 
+	if (boot_editor->cui->current != boot_editor_scr(boot_editor)) {
+		boot_editor->need_update = true;
+		return;
+	}
+
 	widgetset_unpost(boot_editor->widgetset);
 
 	height = pad_height(sysinfo ? sysinfo->n_blockdevs : 0);
@@ -515,30 +586,49 @@ struct boot_editor *boot_editor_init(struct cui *cui,
 				struct pb_boot_data *bd))
 {
 	struct boot_editor *boot_editor;
+	int ncols1, ncols2, ncols3;
 
 	boot_editor = talloc_zero(cui, struct boot_editor);
 
 	if (!boot_editor)
 		return NULL;
 
+#if defined(HAVE_LIBGPGME)
+	if (access(LOCKDOWN_FILE, F_OK) == -1)
+		boot_editor->use_signature_files = false;
+	else
+		boot_editor->use_signature_files = true;
+#else
+	boot_editor->use_signature_files = false;
+#endif
+
 	talloc_set_destructor(boot_editor, boot_editor_destructor);
 	boot_editor->cui = cui;
 	boot_editor->item = item;
 	boot_editor->on_exit = on_exit;
 	boot_editor->state = STATE_EDIT;
+	boot_editor->need_redraw = false;
+	boot_editor->need_update = false;
+
+	ncols1 = strncols(_("Device tree:"));
+	ncols2 = strncols(_("Boot arguments:"));
+	if (boot_editor->use_signature_files)
+		ncols3 = strncols(_("Argument signature file:"));
+	else
+		ncols3 = 0;
 
 	boot_editor->label_x = 1;
-	boot_editor->field_x = 17;
+	boot_editor->field_x = 2 + max(max(ncols1, ncols2), ncols3);
 
 	nc_scr_init(&boot_editor->scr, pb_boot_editor_sig, 0,
 			cui, boot_editor_process_key,
 		boot_editor_post, boot_editor_unpost, boot_editor_resize);
 
 	boot_editor->scr.frame.ltitle = talloc_strdup(boot_editor,
-			"Petitboot Option Editor");
+			_("Petitboot Option Editor"));
 	boot_editor->scr.frame.rtitle = NULL;
 	boot_editor->scr.frame.help = talloc_strdup(boot_editor,
-			"tab=next, shift+tab=previous, x=exit, h=help");
+			_("tab=next, shift+tab=previous, x=exit, h=help"));
 	nc_scr_frame_draw(&boot_editor->scr);
 
 	if (item) {
@@ -547,10 +637,15 @@ struct boot_editor *boot_editor_init(struct cui *cui,
 		boot_editor->initrd = bd->initrd;
 		boot_editor->dtb = bd->dtb;
 		boot_editor->args = bd->args;
+		if (boot_editor->use_signature_files)
+			boot_editor->args_sig_file = bd->args_sig_file;
+		else
+			boot_editor->args_sig_file = talloc_strdup(bd, "");
 		boot_editor_find_device(boot_editor, bd, sysinfo);
 	} else {
 		boot_editor->image = boot_editor->initrd =
-			boot_editor->dtb = boot_editor->args = "";
+			boot_editor->dtb = boot_editor->args =
+			boot_editor->args_sig_file = "";
 	}
 
 	boot_editor->pad = newpad(