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

reset key mappings, when the user specifies no argument to setkey.

Browse source
This commit is contained in:
okuji 2000-10-14 08:09:43 +00:00
parent 9bbcd45d64
commit 2a5ae102fe
2 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2000-10-14 OKUJI Yoshinori <okuji@gnu.org>
* stage2/builtins.c (setkey_func): If TO_KEY is NULL (i.e. the
user specifies no argument), clear BIOS_KEY_MAP and
ASCII_KEY_MAP.
If TO_KEY is non-NULL but FROM_KEY is NULL, set ERRNUM to
ERR_BAD_ARGUMENT and return one.
2000-10-13 OKUJI Yoshinori <okuji@gnu.org> 2000-10-13 OKUJI Yoshinori <okuji@gnu.org>
* docs/grub.texi: Added an entry for the new chapter "Security", * docs/grub.texi: Added an entry for the new chapter "Security",

20
stage2/builtins.c
View file

@ -3213,6 +3213,21 @@ setkey_func (char *arg, int flags)
to_key = arg; to_key = arg;
from_key = skip_to (0, to_key); from_key = skip_to (0, to_key);
if (! to_key)
{
/* If the user specifies no argument, reset the key mappings. */
bios_key_map[0] = 0;
ascii_key_map[0] = 0;
return 0;
}
else if (! from_key)
{
/* The user must specify two arguments or zero argument. */
errnum = ERR_BAD_ARGUMENT;
return 1;
}
nul_terminate (to_key); nul_terminate (to_key);
nul_terminate (from_key); nul_terminate (from_key);
@ -3301,7 +3316,7 @@ static struct builtin builtin_setkey =
"setkey", "setkey",
setkey_func, setkey_func,
BUILTIN_CMDLINE | BUILTIN_MENU, BUILTIN_CMDLINE | BUILTIN_MENU,
"setkey TO_KEY FROM_KEY", "setkey [TO_KEY FROM_KEY]",
"Change the keyboard map. The key FROM_KEY is mapped to the key TO_KEY." "Change the keyboard map. The key FROM_KEY is mapped to the key TO_KEY."
" A key must be an alphabet, a digit, or one of these: escape, exclam," " A key must be an alphabet, a digit, or one of these: escape, exclam,"
" at, numbersign, dollar, percent, caret, ampersand, asterisk, parenleft," " at, numbersign, dollar, percent, caret, ampersand, asterisk, parenleft,"
@ -3309,7 +3324,8 @@ static struct builtin builtin_setkey =
" braceleft, bracketright, braceright, enter, control, semicolon, colon," " braceleft, bracketright, braceright, enter, control, semicolon, colon,"
" quote, doublequote, backquote, tilde, shift, backslash, bar, comma," " quote, doublequote, backquote, tilde, shift, backslash, bar, comma,"
" less, period, greater, slash, question, alt, space, capslock, FX (X" " less, period, greater, slash, question, alt, space, capslock, FX (X"
" is a digit), and delete." " is a digit), and delete. If no argument is specified, reset key"
" mappings."
}; };