vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

core: use GRUB_TERM_ definitions when handling term characters

Browse source 
* Also use hex value for GRUB_TERM_ESC as '\e' is not in the C standard and is not understood by some compilers
This commit is contained in:
Pete Batard 2017-08-07 16:20:30 +01:00 • committed by Vincent Batts
parent 5f294d3b9e
commit 5ba09fb415
13 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
grub-core/normal/auth.c
View file

@ -166,13 +166,13 @@ grub_username_get (char buf[], unsigned buf_size)
if (key == '\n' || key == '\r')
break;
if (key == '\e')
if (key == GRUB_TERM_ESC)
{
cur_len = 0;
break;
}
if (key == '\b')
if (key == GRUB_TERM_BACKSPACE)
{
if (cur_len)
{
@ -197,7 +197,7 @@ grub_username_get (char buf[], unsigned buf_size)
grub_xputs ("\n");
grub_refresh ();
return (key != '\e');
return (key != GRUB_TERM_ESC);
}
grub_err_t

4
grub-core/normal/cmdline.c
View file

@ -626,12 +626,12 @@ grub_cmdline_get (const char *prompt_translated)
cl_insert (cl_terms, nterms, &lpos, &llen, &max_len, &buf, kill_buf);
break;
case '\e':
case GRUB_TERM_ESC:
grub_free (cl_terms);
grub_free (buf);
return 0;
case '\b':
case GRUB_TERM_BACKSPACE:
if (lpos > 0)
{
lpos--;

2
grub-core/normal/menu.c
View file

@ -763,7 +763,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
*auto_boot = 0;
return current_entry;
case '\e':
case GRUB_TERM_ESC:
if (nested)
{
menu_fini ();

2
grub-core/normal/menu_entry.c
View file

@ -1403,7 +1403,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
goto fail;
break;
case '\e':
case GRUB_TERM_ESC:
destroy_screen (screen);
return;