ui/common/url: remove scheme separator from URL scheme definitions

[petitboot] / ui / ncurses / nc-ked.c

diff --git a/ui/ncurses/nc-ked.c b/ui/ncurses/nc-ked.c
index 0f5293489cca22319e3a43b25c09b468e889767f..806d3895767348a72d9620befcf2854bce1a2b96 100644 (file)
--- a/ui/ncurses/nc-ked.c
+++ b/ui/ncurses/nc-ked.c
@@ -149,9 +149,10 @@ static char *ked_chomp(char *s)
        for (; s < s_end; s++)
                if (*s != ' ' && *s != '\t')
                        break;
-       start = s;
 
-       for (++s; s < s_end; s++)
+       start = end = s;
+
+       for (; s < s_end; s++)
                if (*s != ' ' && *s != '\t')
                        end = s;
        *(end + 1) = 0;
@@ -189,6 +190,7 @@ static struct pb_kexec_data *ked_prepare_data(struct ked *ked)
 static void ked_process_key(struct nc_scr *scr)
 {
        struct ked *ked = ked_from_scr(scr);
+       struct pb_kexec_data *kd;
 
        while (1) {
                int c = getch();
@@ -204,29 +206,17 @@ static void ked_process_key(struct nc_scr *scr)
                        break;
 
                /* hot keys */
-               case 2: { /* CTRL-B */
-                       struct pb_kexec_data *kd;
-
-                       form_driver(ked->ncf, REQ_VALIDATION);
-                       kd = ked_prepare_data(ked);
-                       ked->on_exit(ked, ked_boot, kd);
-                       nc_flush_keys();
-                       return;
-               }
                case 27: /* ESC */
                        ked->on_exit(ked, ked_cancel, NULL);
                        nc_flush_keys();
                        return;
                case '\n':
-               case '\r': {
-                       struct pb_kexec_data *kd;
-
+               case '\r':
                        form_driver(ked->ncf, REQ_VALIDATION);
                        kd = ked_prepare_data(ked);
                        ked->on_exit(ked, ked_update, kd);
                        nc_flush_keys();
                        return;
-               }
 
                /* insert mode */
                case KEY_IC:
@@ -334,7 +324,7 @@ struct ked *ked_init(void *ui_ctx, const struct pb_kexec_data *kd,
 
        ked->scr.frame.title = talloc_strdup(ked, "Petitboot Option Editor");
        ked->scr.frame.help = talloc_strdup(ked,
-               "ESC=cancel, Enter=accept, Ctrl-b=boot");
+               "ESC=cancel, Enter=accept");
 
        ked->on_exit = on_exit;