#include <assert.h>
#include <string.h>
-#include <stdlib.h>
#include "log/log.h"
#include "talloc/talloc.h"
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;
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;
char *initrd;
char *dtb;
char *args;
+ char *args_sig_file;
+
+ bool use_signature_files;
};
extern const struct help_text boot_editor_help_text;
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;
sep = "";
if (!prefix)
prefix = "";
- else if (prefix[strlen(prefix)] != '/')
+ else if ((prefix[strlen(prefix) - 1] != '/') &&
+ (value[0] != '/'))
sep = "/";
return talloc_asprintf(ctx, "%s%s%s", prefix, sep, value);
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;
}
break;
case STATE_HELP:
boot_editor->state = STATE_EDIT;
+ boot_editor->need_redraw = true;
cui_show_help(boot_editor->cui, _("Boot Option Editor"),
&boot_editor_help_text);
break;
static int pad_height(int blockdevs_height)
{
- return 10 + blockdevs_height;
+ return 10 + (2 * blockdevs_height);
}
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, 33);
+ 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)
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;
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,
const struct system_info *sysinfo)
{
- struct nc_widgetset *set;
+ struct nc_widgetset *set = boot_editor->widgetset;
int field_size;
field_size = COLS - 1 - boot_editor->field_x;
- boot_editor->widgetset = set = widgetset_create(boot_editor,
- boot_editor->scr.main_ncw,
- boot_editor->pad);
-
- 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_f = widget_new_select(set, 0, 0,
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,
+ 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);
_("Cancel"), cancel_click, boot_editor);
}
-void boot_editor_update(struct boot_editor *boot_editor,
+static void boot_editor_draw(struct boot_editor *boot_editor,
const struct system_info *sysinfo)
{
+ bool repost = false;
int height;
- widgetset_unpost(boot_editor->widgetset);
-
height = pad_height(sysinfo ? sysinfo->n_blockdevs : 0);
- if (getmaxy(boot_editor->pad) < height) {
- delwin(boot_editor->pad);
+
+ if (!boot_editor->pad || getmaxy(boot_editor->pad) < height) {
+ if (boot_editor->pad)
+ delwin(boot_editor->pad);
boot_editor->pad = newpad(height, COLS);
- widgetset_set_windows(boot_editor->widgetset,
- boot_editor->scr.main_ncw,
- boot_editor->pad);
}
- boot_editor_populate_device_select(boot_editor, sysinfo);
+ if (boot_editor->widgetset) {
+ widgetset_unpost(boot_editor->widgetset);
+ talloc_free(boot_editor->widgetset);
+ repost = true;
+ }
- boot_editor_layout_widgets(boot_editor);
+ boot_editor->widgetset = widgetset_create(boot_editor,
+ boot_editor->scr.main_ncw,
+ boot_editor->pad);
+ widgetset_set_widget_focus(boot_editor->widgetset,
+ boot_editor_widget_focus, boot_editor);
- widgetset_post(boot_editor->widgetset);
+ boot_editor_setup_widgets(boot_editor, sysinfo);
+ boot_editor_layout_widgets(boot_editor);
- pad_refresh(boot_editor);
+ if (repost)
+ widgetset_post(boot_editor->widgetset);
}
-/* Return the number of columns required to display a localised string */
-static int strncols(const char *str)
+void boot_editor_update(struct boot_editor *boot_editor,
+ const struct system_info *sysinfo)
{
- int i, wlen, ncols = 0;
- wchar_t *wstr;
+ const char *str;
+
+ if (boot_editor->cui->current != boot_editor_scr(boot_editor)) {
+ boot_editor->need_update = true;
+ return;
+ }
+
+ str = widget_textbox_get_value(boot_editor->widgets.image_f);
+ if (str) {
+ talloc_free(boot_editor->image);
+ boot_editor->image = talloc_strdup(boot_editor, str);
+ }
- wlen = mbstowcs(NULL, str, 0);
- if (wlen <= 0)
- return wlen;
+ str = widget_textbox_get_value(boot_editor->widgets.initrd_f);
+ if (str) {
+ talloc_free(boot_editor->initrd);
+ boot_editor->initrd = talloc_strdup(boot_editor, str);
+ }
- wstr = malloc(sizeof(wchar_t) * wlen + 1);
- if (!wstr)
- return -1;
+ str = widget_textbox_get_value(boot_editor->widgets.dtb_f);
+ if (str) {
+ talloc_free(boot_editor->dtb);
+ boot_editor->dtb = talloc_strdup(boot_editor, str);
+ }
- wlen = mbstowcs(wstr, str, wlen);
- if (wlen <= 0) {
- free(wstr);
- return wlen;
+ str = widget_textbox_get_value(boot_editor->widgets.args_f);
+ if (str) {
+ talloc_free(boot_editor->args);
+ boot_editor->args = talloc_strdup(boot_editor, str);
}
- /* Processing each character individually lets us use the same
- * check for all languages */
- for (i = 0; i < wlen; i++) {
- ncols += wcwidth(wstr[i]);
+ if (boot_editor->use_signature_files) {
+ str = widget_textbox_get_value(boot_editor->widgets.args_sig_file_f);
+ if (str) {
+ talloc_free(boot_editor->args_sig_file);
+ boot_editor->args_sig_file = talloc_strdup(boot_editor, str);
+ }
}
- free(wstr);
- return ncols;
+ boot_editor_draw(boot_editor, sysinfo);
+ pad_refresh(boot_editor);
}
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(SIGNED_BOOT)
+#if !defined(HARD_LOCKDOWN)
+ if (access(LOCKDOWN_FILE, F_OK) == -1)
+ boot_editor->use_signature_files = false;
+ else
+#endif
+ 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;
- int ncols1 = strncols(_("Device tree:"));
- int ncols2 = strncols(_("Boot arguments:"));
+ 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 = 2 + max(ncols1, ncols2);
+ 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,
if (item) {
struct pb_boot_data *bd = cod_from_item(item)->bd;
- boot_editor->image = bd->image;
- boot_editor->initrd = bd->initrd;
- boot_editor->dtb = bd->dtb;
- boot_editor->args = bd->args;
+ boot_editor->image = talloc_strdup(boot_editor, bd->image);
+ boot_editor->initrd = talloc_strdup(boot_editor, bd->initrd);
+ boot_editor->dtb = talloc_strdup(boot_editor, bd->dtb);
+ boot_editor->args = talloc_strdup(boot_editor, bd->args);
+ if (boot_editor->use_signature_files)
+ boot_editor->args_sig_file = talloc_strdup(boot_editor,
+ bd->args_sig_file);
+ else
+ boot_editor->args_sig_file = talloc_strdup(boot_editor,
+ "");
boot_editor_find_device(boot_editor, bd, sysinfo);
- } else {
- boot_editor->image = boot_editor->initrd =
- boot_editor->dtb = boot_editor->args = "";
}
- boot_editor->pad = newpad(
- pad_height(sysinfo ? sysinfo->n_blockdevs : 0),
- COLS);
-
- boot_editor_setup_widgets(boot_editor, sysinfo);
-
- boot_editor_layout_widgets(boot_editor);
+ boot_editor_draw(boot_editor, sysinfo);
wrefresh(boot_editor->scr.main_ncw);
return boot_editor;
projects / petitboot / blobdiff