fix typos in setkey_func.

This commit is contained in:
okuji 2001-01-15 05:54:09 +00:00
parent cccfe78a6a
commit c325ead317
3 changed files with 15 additions and 6 deletions

View file

@ -1,3 +1,12 @@
2001-01-15 OKUJI Yoshinori <okuji@gnu.org>
From Thierry Laronde <thierry.laronde@polynum.com>:
* docs/user-ref.texi (Command-line and menu commands): Update
the description about setkey.
* stage2/builtins.c (setkey_func): When checking if TO_KEY and
FROM_KEY are specified, see *TO_KEY and *FROM_KEY instead of
TO_KEY and FROM_KEY, respectively.
2001-01-13 OKUJI Yoshinori <okuji@gnu.org> 2001-01-13 OKUJI Yoshinori <okuji@gnu.org>
From Thierry Laronde <thierry.laronde@polynum.com>: From Thierry Laronde <thierry.laronde@polynum.com>:

View file

@ -736,11 +736,11 @@ The serial port is not used as a communication channel unless the
This command is only available if GRUB is compiled with serial support. This command is only available if GRUB is compiled with serial support.
@end deffn @end deffn
@deffn Command setkey to_key from_key @deffn Command setkey [to_key from_key]
Change the keyboard map. The key @var{from_key} is mapped to the key Change the keyboard map. The key @var{from_key} is mapped to the key
@var{to_key}. Note that this command @emph{does not} exchange the @var{to_key}. If no argument is specified, reset key mappings. Note that
keys. If you want to exchange the keys, run this command again with the this command @emph{does not} exchange the keys. If you want to exchange
arguments exchanged, like this: the keys, run this command again with the arguments exchanged, like this:
@example @example
grub> @kbd{setkey capslock control} grub> @kbd{setkey capslock control}

View file

@ -3394,7 +3394,7 @@ 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 (! *to_key)
{ {
/* If the user specifies no argument, reset the key mappings. */ /* If the user specifies no argument, reset the key mappings. */
grub_memset (bios_key_map, 0, KEY_MAP_SIZE * sizeof (unsigned short)); grub_memset (bios_key_map, 0, KEY_MAP_SIZE * sizeof (unsigned short));
@ -3402,7 +3402,7 @@ setkey_func (char *arg, int flags)
return 0; return 0;
} }
else if (! from_key) else if (! *from_key)
{ {
/* The user must specify two arguments or zero argument. */ /* The user must specify two arguments or zero argument. */
errnum = ERR_BAD_ARGUMENT; errnum = ERR_BAD_ARGUMENT;