2004-11-02 Hollis Blanchard <hollis@penguinppc.org>

* term/powerpc/ieee1275/ofconsole.c (grub_ofconsole_readkey): Test
	`actual' for negativity.
	* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Remove
	kern/fshelp.c.
This commit is contained in:
hollisb 2004-11-03 03:21:14 +00:00
parent 41ea0ea3fe
commit a2fea4276a
4 changed files with 16 additions and 17 deletions

View file

@ -124,10 +124,10 @@ grub_ofconsole_readkey (int *key)
grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
if (actual && c == '\e')
if (actual > 0 && c == '\e')
{
grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
if (! actual)
if (actual <= 0)
{
*key = '\e';
return 1;
@ -137,7 +137,7 @@ grub_ofconsole_readkey (int *key)
return 0;
grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
if (! actual)
if (actual <= 0)
return 0;
switch (c)
@ -162,7 +162,7 @@ grub_ofconsole_readkey (int *key)
}
*key = c;
return actual;
return actual > 0;
}
static int