X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-boot-editor.c;h=f55fe4ad649854e08018e35d9274f4ad067c9e29;hp=409e638e21eafd39e55aa183b5213d7eeff7373f;hb=75c3e8689b1affde2dc8417ca96ca94bc132408f;hpb=bcb8d5ce5b43c1866b4520a1e8c4bd75ea141c58;ds=sidebyside

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 409e638..f55fe4a 100644
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -22,7 +22,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <stdlib.h>
 
 #include "log/log.h"
 #include "talloc/talloc.h"
@@ -44,6 +43,7 @@ struct boot_editor {
 	void			(*on_exit)(struct cui *cui,
 					struct pmenu_item *item,
 					struct pb_boot_data *bd);
+	bool			need_redraw;
 
 	int			label_x;
 	int			field_x;
@@ -111,7 +111,10 @@ static int boot_editor_post(struct nc_scr *scr)
 	struct boot_editor *boot_editor = boot_editor_from_scr(scr);
 	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;
@@ -173,6 +176,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);
@@ -216,12 +223,18 @@ 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;
+		boot_editor->need_redraw = true;
 		cui_show_help(boot_editor->cui, _("Boot Option Editor"),
 				&boot_editor_help_text);
 		break;
@@ -510,36 +523,6 @@ 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,
@@ -559,6 +542,7 @@ struct boot_editor *boot_editor_init(struct cui *cui,
 	boot_editor->item = item;
 	boot_editor->on_exit = on_exit;
 	boot_editor->state = STATE_EDIT;
+	boot_editor->need_redraw = false;
 
 	int ncols1 = strncols(_("Device tree:"));
 	int ncols2 = strncols(_("Boot arguments:"));