lib/process: Add dry_run argument to process_init

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

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 38d29f826d5556b6ad03b6734f94b6751f1dac9c..0b658f240fabe89dfbf3592c651d152fe9fc6b62 100644 (file)
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -16,6 +16,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #define _GNU_SOURCE
 
 #include <assert.h>
@@ -185,6 +187,9 @@ static struct pb_boot_data *boot_editor_prepare_data(
        bd->initrd = *s ? talloc_strdup(bd, s) : NULL;
 
        s = boot_editor_chomp(field_buffer(boot_editor->fields[2], 0));
+       bd->dtb = *s ? talloc_strdup(bd, s) : NULL;
+
+       s = boot_editor_chomp(field_buffer(boot_editor->fields[3], 0));
        bd->args = *s ? talloc_strdup(bd, s) : NULL;
 
        return bd;
@@ -196,81 +201,72 @@ static struct pb_boot_data *boot_editor_prepare_data(
  * Called from the cui via the scr:process_key method.
  */
 
-static void boot_editor_process_key(struct nc_scr *scr)
+static void boot_editor_process_key(struct nc_scr *scr, int key)
 {
        struct boot_editor *boot_editor = boot_editor_from_scr(scr);
        struct pb_boot_data *bd;
 
-       while (1) {
-               int c = getch();
-
-               if (c == ERR)
-                       return;
-
-               /* DBGS("%d (%o)\n", c, c); */
-
-               switch (c) {
-               default:
-                       boot_editor_move_cursor(boot_editor, c);
-                       break;
+       switch (key) {
+       default:
+               boot_editor_move_cursor(boot_editor, key);
+               break;
 
-               /* hot keys */
-               case 27: /* ESC */
-                       boot_editor->on_exit(boot_editor,
-                                       boot_editor_cancel, NULL);
-                       nc_flush_keys();
-                       return;
-               case '\n':
-               case '\r':
-                       form_driver(boot_editor->ncf, REQ_VALIDATION);
-                       bd = boot_editor_prepare_data(boot_editor);
-                       boot_editor->on_exit(boot_editor,
-                                       boot_editor_update, bd);
-                       nc_flush_keys();
-                       return;
-
-               /* insert mode */
-               case KEY_IC:
-                       boot_editor_insert_mode_tog(boot_editor);
-                       break;
+       /* hot keys */
+       case 27: /* ESC */
+               boot_editor->on_exit(boot_editor,
+                               boot_editor_cancel, NULL);
+               nc_flush_keys();
+               return;
+       case '\n':
+       case '\r':
+               form_driver(boot_editor->ncf, REQ_VALIDATION);
+               bd = boot_editor_prepare_data(boot_editor);
+               boot_editor->on_exit(boot_editor,
+                               boot_editor_update, bd);
+               nc_flush_keys();
+               return;
+
+       /* insert mode */
+       case KEY_IC:
+               boot_editor_insert_mode_tog(boot_editor);
+               break;
 
-               /* form nav */
-               case KEY_PPAGE:
-                       boot_editor_move_field(boot_editor, REQ_FIRST_FIELD);
-                       break;
-               case KEY_NPAGE:
-                       boot_editor_move_field(boot_editor, REQ_LAST_FIELD);
-                       break;
-               case KEY_DOWN:
-                       boot_editor_move_field(boot_editor, REQ_NEXT_FIELD);
-                       break;
-               case KEY_UP:
-                       boot_editor_move_field(boot_editor, REQ_PREV_FIELD);
-                       break;
+       /* form nav */
+       case KEY_PPAGE:
+               boot_editor_move_field(boot_editor, REQ_FIRST_FIELD);
+               break;
+       case KEY_NPAGE:
+               boot_editor_move_field(boot_editor, REQ_LAST_FIELD);
+               break;
+       case KEY_DOWN:
+               boot_editor_move_field(boot_editor, REQ_NEXT_FIELD);
+               break;
+       case KEY_UP:
+               boot_editor_move_field(boot_editor, REQ_PREV_FIELD);
+               break;
 
-               /* field nav */
-               case KEY_HOME:
-                       boot_editor_move_cursor(boot_editor, REQ_BEG_FIELD);
-                       break;
-               case KEY_END:
-                       boot_editor_move_cursor(boot_editor, REQ_END_FIELD);
-                       break;
-               case KEY_LEFT:
-                       boot_editor_move_cursor(boot_editor, REQ_LEFT_CHAR);
-                       break;
-               case KEY_RIGHT:
-                       boot_editor_move_cursor(boot_editor, REQ_RIGHT_CHAR);
-                       break;
-               case KEY_BACKSPACE:
-                       if (boot_editor_move_cursor(boot_editor, REQ_LEFT_CHAR)
-                                       == E_OK)
-                               boot_editor_move_cursor(boot_editor,
-                                               REQ_DEL_CHAR);
-                       break;
-               case KEY_DC:
-                       boot_editor_move_cursor(boot_editor, REQ_DEL_CHAR);
-                       break;
-               }
+       /* field nav */
+       case KEY_HOME:
+               boot_editor_move_cursor(boot_editor, REQ_BEG_FIELD);
+               break;
+       case KEY_END:
+               boot_editor_move_cursor(boot_editor, REQ_END_FIELD);
+               break;
+       case KEY_LEFT:
+               boot_editor_move_cursor(boot_editor, REQ_LEFT_CHAR);
+               break;
+       case KEY_RIGHT:
+               boot_editor_move_cursor(boot_editor, REQ_RIGHT_CHAR);
+               break;
+       case KEY_BACKSPACE:
+               if (boot_editor_move_cursor(boot_editor, REQ_LEFT_CHAR)
+                               == E_OK)
+                       boot_editor_move_cursor(boot_editor,
+                                       REQ_DEL_CHAR);
+               break;
+       case KEY_DC:
+               boot_editor_move_cursor(boot_editor, REQ_DEL_CHAR);
+               break;
        }
 }
 
@@ -324,6 +320,7 @@ struct boot_editor *boot_editor_init(void *ui_ctx,
 
        pb_log("%s: image:  '%s'\n", __func__, bd->image);
        pb_log("%s: initrd: '%s'\n", __func__, bd->initrd);
+       pb_log("%s: dtb:    '%s'\n", __func__, bd->dtb);
        pb_log("%s: args:   '%s'\n", __func__, bd->args);
 
        assert(on_exit);
@@ -346,15 +343,17 @@ struct boot_editor *boot_editor_init(void *ui_ctx,
 
        boot_editor->on_exit = on_exit;
 
-       boot_editor->fields = talloc_array(boot_editor, FIELD *, 7);
+       boot_editor->fields = talloc_array(boot_editor, FIELD *, 9);
 
        boot_editor->fields[0] = boot_editor_setup_field(0, 9, bd->image);
        boot_editor->fields[1] = boot_editor_setup_field(1, 9, bd->initrd);
-       boot_editor->fields[2] = boot_editor_setup_field(2, 9, bd->args);
-       boot_editor->fields[3] = boot_editor_setup_label(0, 1, "image:");
-       boot_editor->fields[4] = boot_editor_setup_label(1, 1, "initrd:");
-       boot_editor->fields[5] = boot_editor_setup_label(2, 1, "args:");
-       boot_editor->fields[6] = NULL;
+       boot_editor->fields[2] = boot_editor_setup_field(2, 9, bd->dtb);
+       boot_editor->fields[3] = boot_editor_setup_field(3, 9, bd->args);
+       boot_editor->fields[4] = boot_editor_setup_label(0, 1, "image:");
+       boot_editor->fields[5] = boot_editor_setup_label(1, 1, "initrd:");
+       boot_editor->fields[6] = boot_editor_setup_label(2, 1, "dtb:");
+       boot_editor->fields[7] = boot_editor_setup_label(3, 1, "args:");
+       boot_editor->fields[8] = NULL;
 
        boot_editor->ncf = new_form(boot_editor->fields);