2009-06-27 Robert Millan <rmh.grub@aybabtu.com>

Revert r2338.

        * loader/i386/linux.c (grub_cmd_linux): Don't call grub_error when
        file can't be opened.  grub_file_open() is already supposed to set
        grub_errno / grub_errmsg appropiately.
        * loader/i386/pc/linux.c (grub_cmd_linux): Likewise.
This commit is contained in:
robertmh 2009-06-27 12:21:18 +00:00
parent 8231fb77c6
commit 87a4623bda
3 changed files with 11 additions and 8 deletions

View file

@ -1,3 +1,12 @@
2009-06-27 Robert Millan <rmh.grub@aybabtu.com>
Revert r2338.
* loader/i386/linux.c (grub_cmd_linux): Don't call grub_error when
file can't be opened. grub_file_open() is already supposed to set
grub_errno / grub_errmsg appropiately.
* loader/i386/pc/linux.c (grub_cmd_linux): Likewise.
2009-06-27 Pavel Roskin <proski@gnu.org>
2009-06-27 Robert Millan <rmh.grub@aybabtu.com>

View file

@ -600,10 +600,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
file = grub_file_open (argv[0]);
if (! file)
{
grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
goto fail;
}
goto fail;
if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
{

View file

@ -69,10 +69,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
file = grub_file_open (argv[0]);
if (! file)
{
grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
goto fail;
}
goto fail;
if ((grub_size_t) grub_file_size (file) > grub_os_area_size)
{