ui/ncurses: Prevent creation of empty boot entry

[petitboot] / ui / ncurses / nc-boot-editor.c

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 6da36302f49641ba52c666c7fb75071b0088d3d5..f78da5611e5838ea3c75050fb5121853fb2f0513 100644 (file)
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -22,6 +22,7 @@
 
 #include <assert.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "log/log.h"
 #include "talloc/talloc.h"
@@ -172,6 +173,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);
@@ -215,6 +220,11 @@ 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);
@@ -305,7 +315,7 @@ static void boot_editor_layout_widgets(struct boot_editor *boot_editor)
        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.cancel_b), y, 33);
 }
 
 static void boot_editor_widget_focus(struct nc_widget *widget, void *arg)
@@ -478,9 +488,9 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
 
        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,
+       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, 6,
+       boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 10,
                                        _("Cancel"), cancel_click, boot_editor);
 }
 
@@ -509,6 +519,36 @@ void boot_editor_update(struct boot_editor *boot_editor,
        pad_refresh(boot_editor);
 }
 
+/* Return the number of columns required to display a localised string */
+static int strncols(const char *str)
+{
+       int i, wlen, ncols = 0;
+       wchar_t *wstr;
+
+       wlen = mbstowcs(NULL, str, 0);
+       if (wlen <= 0)
+               return wlen;
+
+       wstr = malloc(sizeof(wchar_t) * wlen + 1);
+       if (!wstr)
+               return -1;
+
+       wlen = mbstowcs(wstr, str, wlen);
+       if (wlen <= 0) {
+               free(wstr);
+               return wlen;
+       }
+
+       /* Processing each character individually lets us use the same
+        * check for all languages */
+       for (i = 0; i < wlen; i++) {
+               ncols += wcwidth(wstr[i]);
+       }
+
+       free(wstr);
+       return ncols;
+}
+
 struct boot_editor *boot_editor_init(struct cui *cui,
                struct pmenu_item *item,
                const struct system_info *sysinfo,
@@ -529,8 +569,11 @@ struct boot_editor *boot_editor_init(struct cui *cui,
        boot_editor->on_exit = on_exit;
        boot_editor->state = STATE_EDIT;
 
+       int ncols1 = strncols(_("Device tree:"));
+       int ncols2 = strncols(_("Boot arguments:"));
+
        boot_editor->label_x = 1;
-       boot_editor->field_x = 17;
+       boot_editor->field_x = 2 + max(ncols1, ncols2);
 
        nc_scr_init(&boot_editor->scr, pb_boot_editor_sig, 0,
                        cui, boot_editor_process_key,